From 41fdc79b7b80a371cb51d101b2923c56bb20c98b Mon Sep 17 00:00:00 2001 From: Ray Chason Date: Wed, 23 May 2018 23:19:54 -0400 Subject: [PATCH] Qt on Win32: resolve conflict over boolean type --- include/global.h | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/include/global.h b/include/global.h index f92ce3cfc..23183005d 100644 --- 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)