зеркало из https://github.com/mozilla/gecko-dev.git
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
This commit is contained in:
Родитель
8626230808
Коммит
ba7241c9d7
|
@ -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 */
|
||||
|
|
Загрузка…
Ссылка в новой задаче