2010-02-10  Kai Tietz  <kai.tietz@onevision.com>

        * include/shlguid.h: Reduce required _WIN32_IE to >= 0x0500.
        This isn't really correct, but to make it compatible to commctrl.h
        we have to change it here, too.
        * include/shlobj.h: Likewise.



git-svn-id: svn+ssh://svn.code.sf.net/p/mingw-w64/code/trunk@1888 4407c894-4637-0410-b4f5-ada5f102cad1

mingw-w64-headers/ChangeLog

diff --git a/mingw-w64-headers/ChangeLog b/mingw-w64-headers/ChangeLog
index 6ed69cb..4bd9421 100644
--- a/mingw-w64-headers/ChangeLog
+++ b/mingw-w64-headers/ChangeLog
@@ -9,6 +9,10 @@
 
 2010-02-10  Kai Tietz  <kai.tietz@onevision.com>
 
+	* include/shlguid.h: Reduce required _WIN32_IE to >= 0x0500.
+	This isn't really correct, but to make it compatible to commctrl.h
+	we have to change it here, too.
+	* include/shlobj.h: Likewise.
 	* include/winuser.h (POWERBROADCAST_SETTING): New type.
 	(PPOWERBROADCAST_SETTING): Likewise.
 	(RegisterPowerSettingNotification): New API.

mingw-w64-headers/include/shlguid.h

diff --git a/mingw-w64-headers/include/shlguid.h b/mingw-w64-headers/include/shlguid.h
index 21dcb4d..2204bf1 100644
--- a/mingw-w64-headers/include/shlguid.h
+++ b/mingw-w64-headers/include/shlguid.h
@@ -9,7 +9,8 @@
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x0501
 #else
-#if (_WIN32_IE < 0x0501)
+/* FIXME: This really must be 0x0501 !!! */
+#if (_WIN32_IE < 0x0500)
 #error _WIN32_IE setting conflicts
 #endif
 #endif

mingw-w64-headers/include/shlobj.h

diff --git a/mingw-w64-headers/include/shlobj.h b/mingw-w64-headers/include/shlobj.h
index d179099..de78bff 100644
--- a/mingw-w64-headers/include/shlobj.h
+++ b/mingw-w64-headers/include/shlobj.h
@@ -10,7 +10,8 @@
 #ifndef _WIN32_IE
 #define _WIN32_IE 0x0501
 #else
-#if (_WIN32_IE < 0x0501)
+/* FIXME: This really must be 0x0501 !!! */
+#if (_WIN32_IE < 0x0500)
 #error _WIN32_IE setting conflicts
 #endif
 #endif