Bug 1498676 - Revert the __try/__except mapping (part of Bug 1431803) for MinGW from the sandbox code r=bobowen
authorTom Ritter <tom@mozilla.com>
Fri, 12 Oct 2018 13:15:33 -0500
changeset 489562 b705d158c204ff95d5266579de576eaa190988a0
parent 489561 c0b3c3c948fde682b37efa237235248aeb1f7ec2
child 489563 4a46dbac24340804b026adcc919c61081673e5be
push id247
push userfmarier@mozilla.com
push dateSat, 27 Oct 2018 01:06:44 +0000
reviewersbobowen
bugs1498676, 1431803
milestone64.0a1
Bug 1498676 - Revert the __try/__except mapping (part of Bug 1431803) for MinGW from the sandbox code r=bobowen This is no longer necessary, and in fact breaks the sandbox compilation, because code inside the transformed-else blocks is only valid inside an __except block
mozilla-config.h.in
--- a/mozilla-config.h.in
+++ b/mozilla-config.h.in
@@ -40,22 +40,11 @@
 /*
  * 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__
-/*
- * MinGW doesn't support __try / __except. There are a few mechanisms available
- * to hack around it and pseudo-support it, but these are untested in Firefox.
- * What is tested (and works) is replacing them with if(true) and else.
- */
-#define __try if(true)
-#define __except(x) else
-
-#endif /* __MINGW32__ */
 #endif /* defined(CHROMIUM_SANDBOX_BUILD) && defined(XP_WIN) */
 
 #endif /* MOZILLA_CONFIG_H */