Skip to content

Commit

Permalink
Bug 1498676 - Revert the __try/__except mapping (part of Bug 1431803)…
Browse files Browse the repository at this point in the history
… 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
  • Loading branch information
tomrittervg committed Oct 12, 2018
1 parent 8626230 commit ba7241c
Showing 1 changed file with 0 additions and 11 deletions.
11 changes: 0 additions & 11 deletions mozilla-config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -45,17 +45,6 @@
*/
#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 */

0 comments on commit ba7241c

Please sign in to comment.