diff options
| author | SupSuper | 2018-12-16 21:56:19 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2018-12-17 12:28:33 +0200 |
| commit | d0512db25ce5bbd8f31151c3d2374f344f77f006 (patch) | |
| tree | 33563123f9a15b0cb0a0c0d09b6c8599c5761422 /backends/platform | |
| parent | 0a60e6ac8d36fbccf407e0a337ad12bc3d13faf3 (diff) | |
| download | scummvm-rg350-d0512db25ce5bbd8f31151c3d2374f344f77f006.tar.gz scummvm-rg350-d0512db25ce5bbd8f31151c3d2374f344f77f006.tar.bz2 scummvm-rg350-d0512db25ce5bbd8f31151c3d2374f344f77f006.zip | |
WIN32: Move all ARRAYSIZE undefs to util.h
Instead of trying to undefine ARRAYSIZE everywhere we use a Windows header, let's just do it before we define our own
Diffstat (limited to 'backends/platform')
| -rw-r--r-- | backends/platform/sdl/win32/win32-main.cpp | 1 | ||||
| -rw-r--r-- | backends/platform/sdl/win32/win32-window.cpp | 1 | ||||
| -rw-r--r-- | backends/platform/sdl/win32/win32.cpp | 1 |
3 files changed, 0 insertions, 3 deletions
diff --git a/backends/platform/sdl/win32/win32-main.cpp b/backends/platform/sdl/win32/win32-main.cpp index 4e9f6a49da..0a7c1dd8e2 100644 --- a/backends/platform/sdl/win32/win32-main.cpp +++ b/backends/platform/sdl/win32/win32-main.cpp @@ -33,7 +33,6 @@ // "ARRAYSIZE" for example. #define WIN32_LEAN_AND_MEAN #include <windows.h> -#undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one... #include "backends/platform/sdl/win32/win32.h" #include "backends/plugins/sdl/sdl-provider.h" diff --git a/backends/platform/sdl/win32/win32-window.cpp b/backends/platform/sdl/win32/win32-window.cpp index 8c01da0e36..47d77a8ad1 100644 --- a/backends/platform/sdl/win32/win32-window.cpp +++ b/backends/platform/sdl/win32/win32-window.cpp @@ -29,7 +29,6 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one... void SdlWindow_Win32::setupIcon() { HMODULE handle = GetModuleHandle(NULL); diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp index 264a0640ed..e837bbae03 100644 --- a/backends/platform/sdl/win32/win32.cpp +++ b/backends/platform/sdl/win32/win32.cpp @@ -27,7 +27,6 @@ #define WIN32_LEAN_AND_MEAN #include <windows.h> -#undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one... #include <shellapi.h> #if defined(__GNUC__) && defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) // required for SHGFP_TYPE_CURRENT in shlobj.h |