diff options
| author | dhewg | 2012-01-23 18:22:50 +0100 |
|---|---|---|
| committer | dhewg | 2012-01-23 18:22:50 +0100 |
| commit | 77c9be7998b85da24ae292f7eda1e478b32f2e64 (patch) | |
| tree | b4c61fe3249e4bbc0a2c850b7a4c8ee80ee88490 | |
| parent | 967193c3773d23631a1279e02cbeddde563d4e6e (diff) | |
| download | scummvm-rg350-77c9be7998b85da24ae292f7eda1e478b32f2e64.tar.gz scummvm-rg350-77c9be7998b85da24ae292f7eda1e478b32f2e64.tar.bz2 scummvm-rg350-77c9be7998b85da24ae292f7eda1e478b32f2e64.zip | |
COMMON: Fix compilation with mingw-w64
setjmp and longjmp are being used in system headers.
Allow these symbols globally instead of hacking the appropriate
defines in every file including windows.h.
| -rw-r--r-- | common/forbidden.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common/forbidden.h b/common/forbidden.h index 95c1a47d65..8b5a2f738e 100644 --- a/common/forbidden.h +++ b/common/forbidden.h @@ -182,7 +182,8 @@ #define putchar(a) FORBIDDEN_SYMBOL_REPLACEMENT #endif - +// mingw-w64 uses [set|long]jmp in system headers +#ifndef __MINGW64__ #ifndef FORBIDDEN_SYMBOL_EXCEPTION_setjmp #undef setjmp #define setjmp(a) FORBIDDEN_SYMBOL_REPLACEMENT @@ -192,6 +193,7 @@ #undef longjmp #define longjmp(a,b) FORBIDDEN_SYMBOL_REPLACEMENT #endif +#endif // __MINGW64__ #ifndef FORBIDDEN_SYMBOL_EXCEPTION_system #undef system |