[Scummvm-git-logs] scummvm master -> 3cb4e0a3a7f46836d1497075bc2e3010cf3911ec

[dreammaster]

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:
3cb4e0a3a7 GLK: Fix warnings for TRUE/FALSE redefinition on Symbian build.


Commit: 3cb4e0a3a7f46836d1497075bc2e3010cf3911ec
    https://github.com/scummvm/scummvm/commit/3cb4e0a3a7f46836d1497075bc2e3010cf3911ec
Author: Fiodar Stryzhniou (fedor_qd at mail.ru)
Date: 2021-07-21T19:40:35-07:00

Commit Message:
GLK: Fix warnings for TRUE/FALSE redefinition on Symbian build.

Solve bug #12740.

Changed paths:
    engines/glk/level9/level9_main.h
    engines/glk/tads/tads2/lib.h


diff --git a/engines/glk/level9/level9_main.h b/engines/glk/level9/level9_main.h
index ace638519d..47b26b4730 100644
--- a/engines/glk/level9/level9_main.h
+++ b/engines/glk/level9/level9_main.h
@@ -36,6 +36,14 @@ typedef uint16 L9UINT16;
 typedef uint32 L9UINT32;
 typedef bool L9BOOL;
 
+#if defined(FALSE)
+#undef FALSE
+#endif
+
+#if defined(TRUE)
+#undef TRUE
+#endif
+
 #define FALSE false
 #define TRUE true
 
diff --git a/engines/glk/tads/tads2/lib.h b/engines/glk/tads/tads2/lib.h
index 7167c589aa..159e2aed2d 100644
--- a/engines/glk/tads/tads2/lib.h
+++ b/engines/glk/tads/tads2/lib.h
@@ -62,6 +62,14 @@ typedef int            eword;
 #define CLRSTRUCT(x) memset(&(x), 0, (size_t)sizeof(x))
 #define CPSTRUCT(dst,src) memcpy(&(dst), &(src), (size_t)sizeof(dst))
 
+#if defined(TRUE)
+#undef TRUE
+#endif
+
+#if defined(FALSE)
+#undef FALSE
+#endif
+
 /* TRUE and FALSE */
 #define TRUE true
 #define FALSE false