Skip to content
This repository was archived by the owner on Jul 9, 2025. It is now read-only.

Commit ba7241c

Browse files
committed
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
1 parent 8626230 commit ba7241c

1 file changed

Lines changed: 0 additions & 11 deletions

File tree

mozilla-config.h.in

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,6 @@
4545
*/
4646
#if defined(CHROMIUM_SANDBOX_BUILD) && defined(XP_WIN)
4747
#include "base/win/sdkdecls.h"
48-
49-
#ifdef __MINGW32__
50-
/*
51-
* MinGW doesn't support __try / __except. There are a few mechanisms available
52-
* to hack around it and pseudo-support it, but these are untested in Firefox.
53-
* What is tested (and works) is replacing them with if(true) and else.
54-
*/
55-
#define __try if(true)
56-
#define __except(x) else
57-
58-
#endif /* __MINGW32__ */
5948
#endif /* defined(CHROMIUM_SANDBOX_BUILD) && defined(XP_WIN) */
6049

6150
#endif /* MOZILLA_CONFIG_H */

0 commit comments

Comments
 (0)