Qt on Win32: resolve conflict over boolean type

diff --git a/include/global.h b/include/global.h
index f92ce3cfc08360e2d32014b25a9b5061475d67a5..23183005dc48d8f3f5e89d9a0db83cf66db1baa6 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -58,9 +58,14 @@
  * since otherwise comparisons with signed quantities are done incorrectly
  */
 typedef schar xchar;
+#if defined(__GNUC__) && defined(WIN32) && defined(__cplusplus)
+/* Resolve conflict with Qt 5 and MinGW-w32 */
+typedef uchar boolean; /* 0 or 1 */
+#else
 #ifndef SKIP_BOOLEAN
 typedef xchar boolean; /* 0 or 1 */
 #endif
+#endif
 
 #ifndef TRUE /* defined in some systems' native include files */
 #define TRUE ((boolean) 1)