Bug 1431803 Force-include a header to turn __try into if(true) and __except into else draft
authorTom Ritter <tom@mozilla.com>
Mon, 22 Jan 2018 12:18:51 -0600
changeset 723578 90f3c179e59ca15d8388f321259743e86074352d
parent 722757 4c8d460dd1d0d6bfde2fef897f34a7918be42053
child 723579 d52aa31d6bf56a24315f07a43a52a810baee1652
push id96471
push userbmo:tom@mozilla.com
push dateTue, 23 Jan 2018 15:26:55 +0000
bugs1431803
milestone59.0a1
Bug 1431803 Force-include a header to turn __try into if(true) and __except into else MozReview-Commit-ID: IySnfxDlmW3
mozilla-config.h.in
security/sandbox/chromium-shim/base/win/mingw.h
old mode 100644
new mode 100755
--- a/mozilla-config.h.in
+++ b/mozilla-config.h.in
@@ -52,11 +52,14 @@
 /*
  * Force-include sdkdecls.h for building the chromium sandbox code.
  *
  * CHROMIUM_SANDBOX_BUILD is defined in security/sandbox/moz.build.
  * Note that this include path relies on the LOCAL_INCLUDES in that file.
  */
 #if defined(CHROMIUM_SANDBOX_BUILD) && defined(XP_WIN)
 #include "base/win/sdkdecls.h"
+#ifdef __MINGW32__
+#include "base/win/mingw.h"
+#endif
 #endif
 
 #endif /* MOZILLA_CONFIG_H */
new file mode 100755
--- /dev/null
+++ b/security/sandbox/chromium-shim/base/win/mingw.h
@@ -0,0 +1,6 @@
+#ifdef __MINGW32__
+
+#define __try if(true)
+#define __except(x) else
+
+#endif
\ No newline at end of file