From 59dafd8d19ac162f2fd22de31d22e355fd03bd93 Mon Sep 17 00:00:00 2001
From: Jacek Caban <jacek@codeweavers.com>
Date: Tue, 25 Nov 2014 12:43:05 +0100
Subject: [PATCH] Bug 1102815 - mingw builds assert in WindowsCrtPatch.h.
 r=glandium

--HG--
extra : rebase_source : d33a9be405982bc08ab6a762b4e5df9c013a3856
---
 toolkit/xre/nsWindowsWMain.cpp | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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