Check defines do not already exist in recent system headers SDL-1.2
authorPatrice Mandin <patmandin@gmail.com>
Thu, 07 Aug 2008 20:38:35 +0000
branchSDL-1.2
changeset 4149 2325dd996f73
parent 4148 3e7f2edce658
child 4150 1019eb074a56
Check defines do not already exist in recent system headers
src/audio/mint/SDL_mintaudio.h
src/video/ataricommon/SDL_gemdosevents.c
--- a/src/audio/mint/SDL_mintaudio.h	Fri Jul 25 10:52:10 2008 +0000
+++ b/src/audio/mint/SDL_mintaudio.h	Thu Aug 07 20:38:35 2008 +0000
@@ -84,6 +84,7 @@
 #define MASTERPREDIV_MILAN	256
 
 /* MFP 68901 interrupt sources */
+#ifndef MFP_PARALLEL
 enum {
 	MFP_PARALLEL=0,
 	MFP_DCD,
@@ -106,14 +107,17 @@
 	MFP_RING,
 	MFP_MONODETECT
 };
+#endif
 
 /* Xbtimer() timers */
+#ifndef XB_TIMERA
 enum {
 	XB_TIMERA=0,
 	XB_TIMERB,
 	XB_TIMERC,
 	XB_TIMERD
 };
+#endif
 
 /* Variables */
 extern SDL_AudioDevice *SDL_MintAudio_device;
--- a/src/video/ataricommon/SDL_gemdosevents.c	Fri Jul 25 10:52:10 2008 +0000
+++ b/src/video/ataricommon/SDL_gemdosevents.c	Thu Aug 07 20:38:35 2008 +0000
@@ -45,10 +45,12 @@
 static unsigned char gemdos_previouskeyboard[ATARIBIOS_MAXKEYS];
 static SDL_bool use_dev_mouse = SDL_FALSE;
 
+#ifndef DEV_BUSY
 enum {
 	DEV_BUSY=0,
 	DEV_READY
 };
+#endif
 
 static void UpdateSpecialKeys(int special_keys_state);