Commit 25dd340b authored by Patrice Mandin's avatar Patrice Mandin

Check defines do not already exist in recent system headers

--HG--
branch : SDL-1.2
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/branches/SDL-1.2%403060
parent ea1fe254
...@@ -84,6 +84,7 @@ enum { ...@@ -84,6 +84,7 @@ enum {
#define MASTERPREDIV_MILAN 256 #define MASTERPREDIV_MILAN 256
/* MFP 68901 interrupt sources */ /* MFP 68901 interrupt sources */
#ifndef MFP_PARALLEL
enum { enum {
MFP_PARALLEL=0, MFP_PARALLEL=0,
MFP_DCD, MFP_DCD,
...@@ -106,14 +107,17 @@ enum { ...@@ -106,14 +107,17 @@ enum {
MFP_RING, MFP_RING,
MFP_MONODETECT MFP_MONODETECT
}; };
#endif
/* Xbtimer() timers */ /* Xbtimer() timers */
#ifndef XB_TIMERA
enum { enum {
XB_TIMERA=0, XB_TIMERA=0,
XB_TIMERB, XB_TIMERB,
XB_TIMERC, XB_TIMERC,
XB_TIMERD XB_TIMERD
}; };
#endif
/* Variables */ /* Variables */
extern SDL_AudioDevice *SDL_MintAudio_device; extern SDL_AudioDevice *SDL_MintAudio_device;
......
...@@ -45,10 +45,12 @@ static unsigned char gemdos_currentkeyboard[ATARIBIOS_MAXKEYS]; ...@@ -45,10 +45,12 @@ static unsigned char gemdos_currentkeyboard[ATARIBIOS_MAXKEYS];
static unsigned char gemdos_previouskeyboard[ATARIBIOS_MAXKEYS]; static unsigned char gemdos_previouskeyboard[ATARIBIOS_MAXKEYS];
static SDL_bool use_dev_mouse = SDL_FALSE; static SDL_bool use_dev_mouse = SDL_FALSE;
#ifndef DEV_BUSY
enum { enum {
DEV_BUSY=0, DEV_BUSY=0,
DEV_READY DEV_READY
}; };
#endif
static void UpdateSpecialKeys(int special_keys_state); static void UpdateSpecialKeys(int special_keys_state);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment