Fix: [Win32] WIN32 may not be defined, always prefer the compiler predefined macro _WIN32
This commit is contained in:
@@ -73,7 +73,7 @@ static void DedicatedSignalHandler(int sig)
|
||||
}
|
||||
#endif
|
||||
|
||||
#if defined(WIN32)
|
||||
#if defined(_WIN32)
|
||||
# include <windows.h> /* GetTickCount */
|
||||
# include <conio.h>
|
||||
# include <time.h>
|
||||
@@ -150,7 +150,7 @@ const char *VideoDriver_Dedicated::Start(const char * const *parm)
|
||||
ScreenSizeChanged();
|
||||
BlitterFactory::GetCurrentBlitter()->PostResize();
|
||||
|
||||
#if defined(WIN32)
|
||||
#if defined(_WIN32)
|
||||
/* For win32 we need to allocate a console (debug mode does the same) */
|
||||
CreateConsole();
|
||||
CreateWindowsConsoleThread();
|
||||
@@ -173,7 +173,7 @@ const char *VideoDriver_Dedicated::Start(const char * const *parm)
|
||||
|
||||
void VideoDriver_Dedicated::Stop()
|
||||
{
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
CloseWindowsConsoleThread();
|
||||
#endif
|
||||
free(_dedicated_video_mem);
|
||||
|
@@ -264,7 +264,7 @@ static void GetAvailableVideoMode(uint *w, uint *h)
|
||||
*h = _resolutions[best].height;
|
||||
}
|
||||
|
||||
#ifdef WIN32
|
||||
#ifdef _WIN32
|
||||
/* Let's redefine the LoadBMP macro with because we are dynamically
|
||||
* loading SDL and need to 'SDL_CALL' all functions */
|
||||
#undef SDL_LoadBMP
|
||||
@@ -500,7 +500,7 @@ static uint ConvertSdlKeyIntoMy(SDL_keysym *sym, WChar *character)
|
||||
}
|
||||
|
||||
/* check scancode for BACKQUOTE key, because we want the key left of "1", not anything else (on non-US keyboards) */
|
||||
#if defined(WIN32) || defined(__OS2__)
|
||||
#if defined(_WIN32) || defined(__OS2__)
|
||||
if (sym->scancode == 41) key = WKC_BACKQUOTE;
|
||||
#elif defined(__APPLE__)
|
||||
if (sym->scancode == 10) key = WKC_BACKQUOTE;
|
||||
|
Reference in New Issue
Block a user