From 04e170ceb7ac89980ec17dc983a1c9a99b0377e0 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 20 Oct 2013 20:41:30 -0700 Subject: [PATCH] Added __WINDOWS__ to reflect both 32 and 64-bit windows platforms --- TODO.txt | 5 ----- include/SDL_platform.h | 6 +++++- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/TODO.txt b/TODO.txt index 14c47d0ebc531..89637ebdbfeac 100644 --- a/TODO.txt +++ b/TODO.txt @@ -1,15 +1,10 @@ Future work roadmap: * http://wiki.libsdl.org/moin.cgi/Roadmap - * See why windows are being rearranged. Is the shield window not up? - * Add __WINDOWS__ in addition to __WIN32__ - * Write test for fullscreen gamma to check X11 colormap handling - * Check 1.2 revisions: 3554 - Need to resolve semantics for locking keys on different platforms 4874 - Do we want screen rotation? At what level? 4974 - Windows file code needs to convert UTF-8 to Unicode, but we don't need to tap dance for Windows 95/98 - 4484, 4485 - Verify that SDL's Windows keyboard handling works correctly 4865 - See if this is still needed (mouse coordinate clamping) 4866 - See if this is still needed (blocking window repositioning) diff --git a/include/SDL_platform.h b/include/SDL_platform.h index b4849afec09ec..a40c41e265d56 100644 --- a/include/SDL_platform.h +++ b/include/SDL_platform.h @@ -121,8 +121,12 @@ #define __SOLARIS__ 1 #endif #if defined(WIN32) || defined(_WIN32) || defined(__CYGWIN__) +#undef __WINDOWS__ +#define __WINDOWS__ 1 +#endif +#if defined(__WINDOWS__) #undef __WIN32__ -#define __WIN32__ 1 +#define __WIN32__ 1 #endif #if defined(__PSP__) #undef __PSP__