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 41492325dd996f73
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
     1.1 --- a/src/audio/mint/SDL_mintaudio.h	Fri Jul 25 10:52:10 2008 +0000
     1.2 +++ b/src/audio/mint/SDL_mintaudio.h	Thu Aug 07 20:38:35 2008 +0000
     1.3 @@ -84,6 +84,7 @@
     1.4  #define MASTERPREDIV_MILAN	256
     1.5  
     1.6  /* MFP 68901 interrupt sources */
     1.7 +#ifndef MFP_PARALLEL
     1.8  enum {
     1.9  	MFP_PARALLEL=0,
    1.10  	MFP_DCD,
    1.11 @@ -106,14 +107,17 @@
    1.12  	MFP_RING,
    1.13  	MFP_MONODETECT
    1.14  };
    1.15 +#endif
    1.16  
    1.17  /* Xbtimer() timers */
    1.18 +#ifndef XB_TIMERA
    1.19  enum {
    1.20  	XB_TIMERA=0,
    1.21  	XB_TIMERB,
    1.22  	XB_TIMERC,
    1.23  	XB_TIMERD
    1.24  };
    1.25 +#endif
    1.26  
    1.27  /* Variables */
    1.28  extern SDL_AudioDevice *SDL_MintAudio_device;
     2.1 --- a/src/video/ataricommon/SDL_gemdosevents.c	Fri Jul 25 10:52:10 2008 +0000
     2.2 +++ b/src/video/ataricommon/SDL_gemdosevents.c	Thu Aug 07 20:38:35 2008 +0000
     2.3 @@ -45,10 +45,12 @@
     2.4  static unsigned char gemdos_previouskeyboard[ATARIBIOS_MAXKEYS];
     2.5  static SDL_bool use_dev_mouse = SDL_FALSE;
     2.6  
     2.7 +#ifndef DEV_BUSY
     2.8  enum {
     2.9  	DEV_BUSY=0,
    2.10  	DEV_READY
    2.11  };
    2.12 +#endif
    2.13  
    2.14  static void UpdateSpecialKeys(int special_keys_state);
    2.15