From ff95dca4e6d1c0be28334a30df854473e05e927a Mon Sep 17 00:00:00 2001
From: Tom Ritter <tom@mozilla.com>
Date: Wed, 9 Oct 2019 14:53:36 +0000
Subject: [PATCH] Bug 1585373 - Re-enable PoisonIOInterposer for the mingw
 build r=dmajor

This was disabled in Bug 1441558 because it broke the mingw-gcc build.
But it doesn't break the mingw-clang build, and we don't support mingw-gcc
anymore, so we can re-enable it.

Differential Revision: https://phabricator.services.mozilla.com/D48645

--HG--
extra : moz-landing-system : lando
---
 xpcom/build/PoisonIOInterposer.h |  4 ++--
 xpcom/build/moz.build            | 13 +++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/xpcom/build/PoisonIOInterposer.h b/xpcom/build/PoisonIOInterposer.h
index c8009bcac400..5c488369f955 100644
--- a/xpcom/build/PoisonIOInterposer.h
+++ b/xpcom/build/PoisonIOInterposer.h
@@ -37,7 +37,7 @@ void MozillaUnRegisterDebugFILE(FILE* aFile);
 
 MOZ_END_EXTERN_C
 
-#if defined(XP_MACOSX) || (defined(XP_WIN) && !defined(__MINGW32__))
+#if defined(XP_MACOSX) || defined(XP_WIN)
 
 #  ifdef __cplusplus
 namespace mozilla {
@@ -74,7 +74,7 @@ void ClearPoisonIOInterposer();
 }  // namespace mozilla
 #  endif /* __cplusplus */
 
-#else /* defined(XP_MACOSX) || (defined(XP_WIN) && !defined(__MINGW32__)) */
+#else /* defined(XP_MACOSX) || defined(XP_WIN) */
 
 #  ifdef __cplusplus
 namespace mozilla {
diff --git a/xpcom/build/moz.build b/xpcom/build/moz.build
index 069fcbe0d111..d8674b3c29fb 100755
--- a/xpcom/build/moz.build
+++ b/xpcom/build/moz.build
@@ -30,14 +30,11 @@ if CONFIG['OS_ARCH'] == 'WINNT':
     EXPORTS.mozilla += [
         'perfprobe.h',
     ]
-    SOURCES += ['perfprobe.cpp']
-    if CONFIG['CC_TYPE'] not in ('gcc', 'clang'):
-        SOURCES += [
-            'PoisonIOInterposerBase.cpp',
-            'PoisonIOInterposerWin.cpp',
-        ]
-    else:
-        SOURCES += ['PoisonIOInterposerStub.cpp']
+    SOURCES += [
+        'perfprobe.cpp',
+        'PoisonIOInterposerBase.cpp',
+        'PoisonIOInterposerWin.cpp',
+    ]
 elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
     UNIFIED_SOURCES += [
         'PoisonIOInterposerBase.cpp',