Check defines do not already exist in recent system headers SDL-1.2
authorPatrice Mandin <patmandin@gmail.com>
Thu, 07 Aug 2008 20:55:45 +0000
branchSDL-1.2
changeset 41501019eb074a56
parent 4149 2325dd996f73
child 4151 cab9823cb55e
Check defines do not already exist in recent system headers
src/video/ataricommon/SDL_atarimxalloc_c.h
src/video/xbios/SDL_xbios.h
     1.1 --- a/src/video/ataricommon/SDL_atarimxalloc_c.h	Thu Aug 07 20:38:35 2008 +0000
     1.2 +++ b/src/video/ataricommon/SDL_atarimxalloc_c.h	Thu Aug 07 20:55:45 2008 +0000
     1.3 @@ -33,10 +33,12 @@
     1.4  /*--- Defines ---*/
     1.5  
     1.6  /* Mxalloc parameters */
     1.7 +#ifndef MX_STRAM
     1.8  #define MX_STRAM 0
     1.9  #define MX_TTRAM 1
    1.10  #define MX_PREFSTRAM 2
    1.11  #define MX_PREFTTRAM 3
    1.12 +#endif
    1.13  
    1.14  /*--- Functions ---*/
    1.15  
     2.1 --- a/src/video/xbios/SDL_xbios.h	Thu Aug 07 20:38:35 2008 +0000
     2.2 +++ b/src/video/xbios/SDL_xbios.h	Thu Aug 07 20:55:45 2008 +0000
     2.3 @@ -89,18 +89,17 @@
     2.4  };
     2.5  
     2.6  /* EgetShift masks */
     2.7 -#define ES_BANK		0x000f
     2.8  #define ES_MODE		0x0700
     2.9 -#define ES_GRAY		0x1000
    2.10 -#define ES_SMEAR	0x8000
    2.11  
    2.12  /* TT shifter modes */
    2.13 +#ifndef ST_LOW
    2.14  #define ST_LOW	0x0000
    2.15  #define ST_MED	0x0100
    2.16  #define ST_HIGH	0x0200
    2.17  #define TT_LOW	0x0700
    2.18  #define TT_MED	0x0300
    2.19  #define TT_HIGH	0x0600
    2.20 +#endif
    2.21  
    2.22  /* Hidden structure -> variables names */
    2.23  #define SDL_modelist		(this->hidden->SDL_modelist)