Bug 730212 - Set _WIN32_IE to 0x0603 (XPSP2). r=jimm
authorMakoto Kato <m_kato@ga2.so-net.ne.jp>
Sun, 26 Feb 2012 00:20:36 +0900
changeset 90606 bb55af76a3b907f23f232f30004ecf645dceb58d
parent 90605 3160e7df9b4db77df9d631faffe68e5201311de4
child 90607 5dd8529c9346dc8769985ea31300f76172293ac3
push idunknown
push userunknown
push dateunknown
reviewersjimm
bugs730212
milestone13.0a1
Bug 730212 - Set _WIN32_IE to 0x0603 (XPSP2). r=jimm
configure.in
js/src/configure.in
toolkit/components/downloads/nsDownloadScanner.h
--- a/configure.in
+++ b/configure.in
@@ -959,18 +959,18 @@ EOF
             AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.])
         fi
 
         MOZ_WINSDK_MAXVER=0x06010000
     fi # !GNU_CC
 
     AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
     AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
-    # Require OS features provided by IE 5.0
-    AC_DEFINE_UNQUOTED(_WIN32_IE,0x0500)
+    # Require OS features provided by IE 6.0 SP2 (XP SP2)
+    AC_DEFINE_UNQUOTED(_WIN32_IE,0x0603)
 
     # If the maximum version supported by this SDK is lower than the target
     # version, error out
     AC_MSG_CHECKING([for Windows SDK being recent enough])
     if $PERL -e "exit(0x$MOZ_WINSDK_TARGETVER > $MOZ_WINSDK_MAXVER)"; then
         AC_MSG_RESULT("yes")
     else
         AC_MSG_RESULT("no")
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -915,18 +915,18 @@ EOF
             AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.])
         fi
 
         MOZ_WINSDK_MAXVER=0x06010000
     fi # !GNU_CC
 
     AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
     AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
-    # Require OS features provided by IE 5.0
-    AC_DEFINE_UNQUOTED(_WIN32_IE,0x0500)
+    # Require OS features provided by IE 6.0 SP2 (XP SP2)
+    AC_DEFINE_UNQUOTED(_WIN32_IE,0x0603)
 
     # If the maximum version supported by this SDK is lower than the target
     # version, error out
     AC_MSG_CHECKING([for Windows SDK being recent enough])
     if $PERL -e "exit(0x$MOZ_WINSDK_TARGETVER > $MOZ_WINSDK_MAXVER)"; then
         AC_MSG_RESULT("yes")
     else
         AC_MSG_RESULT("no")
--- a/toolkit/components/downloads/nsDownloadScanner.h
+++ b/toolkit/components/downloads/nsDownloadScanner.h
@@ -6,21 +6,16 @@
 
 #ifdef WIN32_LEAN_AND_MEAN
 #undef WIN32_LEAN_AND_MEAN
 #endif
 #define INITGUID
 #include <windows.h>
 #define AVVENDOR
 #include <msoav.h>
-// To cope with both msvs8 header and sdk6 header
-#ifdef _WIN32_IE_IE60SP2
-#undef _WIN32_IE
-#define _WIN32_IE _WIN32_IE_IE60SP2
-#endif
 #include <shlobj.h>
 
 #include "nsAutoPtr.h"
 #include "nsThreadUtils.h"
 #include "nsTArray.h"
 #include "nsIObserver.h"
 #include "nsIURI.h"