diff --git a/src/audio/mint/SDL_mintaudio.h b/src/audio/mint/SDL_mintaudio.h index 9a0258007..cda5babcc 100644 --- a/src/audio/mint/SDL_mintaudio.h +++ b/src/audio/mint/SDL_mintaudio.h @@ -84,6 +84,7 @@ enum { #define MASTERPREDIV_MILAN 256 /* MFP 68901 interrupt sources */ +#ifndef MFP_PARALLEL enum { MFP_PARALLEL=0, MFP_DCD, @@ -106,14 +107,17 @@ enum { 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; diff --git a/src/video/ataricommon/SDL_gemdosevents.c b/src/video/ataricommon/SDL_gemdosevents.c index 598dff788..47b7354ac 100644 --- a/src/video/ataricommon/SDL_gemdosevents.c +++ b/src/video/ataricommon/SDL_gemdosevents.c @@ -45,10 +45,12 @@ static unsigned char gemdos_currentkeyboard[ATARIBIOS_MAXKEYS]; 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);