aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Kohaut2017-03-10 00:07:09 +0100
committerPeter Kohaut2017-03-10 00:07:09 +0100
commit652c29914bdced76cf3c3476fedacdef0d355e1c (patch)
treebbf4242fed5234163075fcf51a0bc5959c3447e3
parentd34314ccc9d767907589babc561c60abbb078e29 (diff)
downloadscummvm-rg350-652c29914bdced76cf3c3476fedacdef0d355e1c.tar.gz
scummvm-rg350-652c29914bdced76cf3c3476fedacdef0d355e1c.tar.bz2
scummvm-rg350-652c29914bdced76cf3c3476fedacdef0d355e1c.zip
BUILD: Fixed mingw-w64 32 bits build
-rw-r--r--common/forbidden.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/common/forbidden.h b/common/forbidden.h
index d6fd9c42fe..8f0220bb04 100644
--- a/common/forbidden.h
+++ b/common/forbidden.h
@@ -183,7 +183,7 @@
#endif
// mingw-w64 uses [set|long]jmp in system headers
-#ifndef __MINGW64__
+#if !defined __MINGW64__ && ! defined __MINGW32__
#ifndef FORBIDDEN_SYMBOL_EXCEPTION_setjmp
#undef setjmp
#define setjmp(a) FORBIDDEN_SYMBOL_REPLACEMENT
@@ -193,7 +193,7 @@
#undef longjmp
#define longjmp(a,b) FORBIDDEN_SYMBOL_REPLACEMENT
#endif
-#endif // __MINGW64__
+#endif // __MINGW64__ __MINGW32__
#ifndef FORBIDDEN_SYMBOL_EXCEPTION_system
#undef system