[Scummvm-git-logs] scummvm master -> ec0b1dec9d085700dce9fdcc7d0a60ea3fc4ba51

[Kirben]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ec0b1dec9d WINDOWS: Fix warning under mingw-w64.


Commit: ec0b1dec9d085700dce9fdcc7d0a60ea3fc4ba51
    https://github.com/scummvm/scummvm/commit/ec0b1dec9d085700dce9fdcc7d0a60ea3fc4ba51
Author: Kirben (kirben at optusnet.com.au)
Date: 2017-04-24T11:22:44+10:00

Commit Message:
WINDOWS: Fix warning under mingw-w64.

Changed paths:
    backends/platform/sdl/win32/win32.cpp


diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp
index f50059e..073ad74 100644
--- a/backends/platform/sdl/win32/win32.cpp
+++ b/backends/platform/sdl/win32/win32.cpp
@@ -29,7 +29,10 @@
 #include <windows.h>
 #undef ARRAYSIZE // winnt.h defines ARRAYSIZE, but we want our own one...
 #include <shellapi.h>
-#define _WIN32_IE 0x500 // required for SHGFP_TYPE_CURRENT in shlobj.h
+#if defined(__GNUC__) && defined(__MINGW32__) && !defined(__MINGW64_VERSION_MAJOR)
+// required for SHGFP_TYPE_CURRENT in shlobj.h
+#define _WIN32_IE 0x500
+#endif
 #include <shlobj.h>
 
 #include "common/scummsys.h"