From d0512db25ce5bbd8f31151c3d2374f344f77f006 Mon Sep 17 00:00:00 2001 From: SupSuper Date: Sun, 16 Dec 2018 21:56:19 +0000 Subject: 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 --- backends/saves/windows/windows-saves.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'backends/saves') diff --git a/backends/saves/windows/windows-saves.cpp b/backends/saves/windows/windows-saves.cpp index fec4828725..50564e974d 100644 --- a/backends/saves/windows/windows-saves.cpp +++ b/backends/saves/windows/windows-saves.cpp @@ -22,12 +22,8 @@ #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(DISABLE_DEFAULT_SAVEFILEMANAGER) -#if defined(ARRAYSIZE) -#undef ARRAYSIZE -#endif #define WIN32_LEAN_AND_MEAN #include -#undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one... #if defined(__GNUC__) && defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR) // required for SHGFP_TYPE_CURRENT in shlobj.h #define _WIN32_IE 0x500 -- cgit v1.2.3