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 4150 1019eb074a56
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
--- a/src/video/ataricommon/SDL_atarimxalloc_c.h	Thu Aug 07 20:38:35 2008 +0000
+++ b/src/video/ataricommon/SDL_atarimxalloc_c.h	Thu Aug 07 20:55:45 2008 +0000
@@ -33,10 +33,12 @@
 /*--- Defines ---*/
 
 /* Mxalloc parameters */
+#ifndef MX_STRAM
 #define MX_STRAM 0
 #define MX_TTRAM 1
 #define MX_PREFSTRAM 2
 #define MX_PREFTTRAM 3
+#endif
 
 /*--- Functions ---*/
 
--- a/src/video/xbios/SDL_xbios.h	Thu Aug 07 20:38:35 2008 +0000
+++ b/src/video/xbios/SDL_xbios.h	Thu Aug 07 20:55:45 2008 +0000
@@ -89,18 +89,17 @@
 };
 
 /* EgetShift masks */
-#define ES_BANK		0x000f
 #define ES_MODE		0x0700
-#define ES_GRAY		0x1000
-#define ES_SMEAR	0x8000
 
 /* TT shifter modes */
+#ifndef ST_LOW
 #define ST_LOW	0x0000
 #define ST_MED	0x0100
 #define ST_HIGH	0x0200
 #define TT_LOW	0x0700
 #define TT_MED	0x0300
 #define TT_HIGH	0x0600
+#endif
 
 /* Hidden structure -> variables names */
 #define SDL_modelist		(this->hidden->SDL_modelist)