[Scummvm-git-logs] scummvm master -> 652c29914bdced76cf3c3476fedacdef0d355e1c

[peterkohaut]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
652c29914b BUILD: Fixed mingw-w64 32 bits build


Commit: 652c29914bdced76cf3c3476fedacdef0d355e1c
    https://github.com/scummvm/scummvm/commit/652c29914bdced76cf3c3476fedacdef0d355e1c
Author: Peter Kohaut (peter.kohaut at gmail.com)
Date: 2017-03-10T00:07:09+01:00

Commit Message:
BUILD: Fixed mingw-w64 32 bits build

Changed paths:
    common/forbidden.h


diff --git a/common/forbidden.h b/common/forbidden.h
index d6fd9c4..8f0220b 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