diff --git a/toolkit/xre/nsWindowsWMain.cpp b/toolkit/xre/nsWindowsWMain.cpp
index 36110cae073..dc3edc0ca5f 100644
--- a/toolkit/xre/nsWindowsWMain.cpp
+++ b/toolkit/xre/nsWindowsWMain.cpp
@@ -16,6 +16,10 @@
 #include "nsSetDllDirectory.h"
 #endif
 
+#if defined(MOZ_METRO) || defined(__GNUC__)
+#define XRE_DONT_SUPPORT_XPSP2
+#endif
+
 #ifndef XRE_DONT_SUPPORT_XPSP2
 #include "WindowsCrtPatch.h"
 #endif
@@ -80,7 +84,7 @@ FreeAllocStrings(int argc, char **argv)
 
 int wmain(int argc, WCHAR **argv)
 {
-#if !defined(XRE_DONT_SUPPORT_XPSP2) && !defined(MOZ_METRO)
+#if !defined(XRE_DONT_SUPPORT_XPSP2)
   WindowsCrtPatch::Init();
 #endif