diff --git a/neo/sys/glimp.cpp b/neo/sys/glimp.cpp index a60ecf26..322ac21a 100644 --- a/neo/sys/glimp.cpp +++ b/neo/sys/glimp.cpp @@ -246,14 +246,11 @@ bool GLimp_Init(glimpParms_t parms) { #if SDL_VERSION_ATLEAST(2, 0, 0) int displayIndex = 0; +#if SDL_VERSION_ATLEAST(2, 0, 4) // try to put the window on the display the mousecursor currently is on { int x, y; -#if SDL_VERSION_ATLEAST(2, 0, 4) SDL_GetGlobalMouseState(&x, &y); -#else - x = y = 0; -#endif int numDisplays = SDL_GetNumVideoDisplays(); for ( int j=0; j #ifdef __MAC_OS_X_VERSION_MIN_REQUIRED #if __MAC_OS_X_VERSION_MIN_REQUIRED == 1040 -#define OSX_TIGER 1 +#define OSX_TIGER #elif __MAC_OS_X_VERSION_MIN_REQUIRED < 1060 -#define OSX_LEOPARD 1 +#define OSX_LEOPARD #endif #endif #endif diff --git a/neo/sys/posix/posix_main.cpp b/neo/sys/posix/posix_main.cpp index 9eaa2963..884349b8 100644 --- a/neo/sys/posix/posix_main.cpp +++ b/neo/sys/posix/posix_main.cpp @@ -401,7 +401,7 @@ int Sys_GetDriveFreeSpace( const char *path ) { static const int crashSigs[] = { SIGILL, SIGABRT, SIGFPE, SIGSEGV }; static const char* crashSigNames[] = { "SIGILL", "SIGABRT", "SIGFPE", "SIGSEGV" }; -#if ( defined(__linux__) && defined(__GLIBC__) ) || defined(__FreeBSD__) || (defined(__APPLE__) && !OSX_TIGER) +#if ( defined(__linux__) && defined(__GLIBC__) ) || defined(__FreeBSD__) || (defined(__APPLE__) && !defined(OSX_TIGER)) #define D3_HAVE_BACKTRACE #include #endif