From cd840be1baea9fd690b1e9b5b172f0e0fcfa4a01 Mon Sep 17 00:00:00 2001 From: Patrice Mandin Date: Thu, 7 Aug 2008 20:55:45 +0000 Subject: [PATCH] Check defines do not already exist in recent system headers --- src/video/ataricommon/SDL_atarimxalloc_c.h | 2 ++ src/video/xbios/SDL_xbios.h | 5 ++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/video/ataricommon/SDL_atarimxalloc_c.h b/src/video/ataricommon/SDL_atarimxalloc_c.h index 32e6e1a56..cf15eff20 100644 --- a/src/video/ataricommon/SDL_atarimxalloc_c.h +++ b/src/video/ataricommon/SDL_atarimxalloc_c.h @@ -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 ---*/ diff --git a/src/video/xbios/SDL_xbios.h b/src/video/xbios/SDL_xbios.h index fce132615..960b3803c 100644 --- a/src/video/xbios/SDL_xbios.h +++ b/src/video/xbios/SDL_xbios.h @@ -89,18 +89,17 @@ enum { }; /* 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)