tinker with boolean for mingw32

diff --git a/include/global.h b/include/global.h
index 6e0f96ebf28ce0020fda5f6e18ae9a07fc616ec0..feb9f75fb8665276a4b142e43df7525adc29e403 100644 (file)
--- a/include/global.h
+++ b/include/global.h
@@ -70,9 +70,10 @@
  * since otherwise comparisons with signed quantities are done incorrectly
  */
 typedef schar xchar;
-#if defined(__GNUC__) && defined(WIN32) && defined(__cplusplus)
+
+#ifdef __MINGW32__
 /* Resolve conflict with Qt 5 and MinGW-w32 */
-typedef uchar boolean; /* 0 or 1 */
+typedef unsigned char boolean; /* 0 or 1 */
 #else
 #ifndef SKIP_BOOLEAN
 typedef xchar boolean; /* 0 or 1 */

diff --git a/sys/winnt/win32api.h b/sys/winnt/win32api.h
index d620973a80d5a88985ec1a7cfebfda62ef425b82..28514b0ce4739c02b0801f896f25b3431ba8ea09 100644 (file)
--- a/sys/winnt/win32api.h
+++ b/sys/winnt/win32api.h
@@ -36,11 +36,6 @@
 #pragma pack(8)
 #endif // _MSC_VER
 
-#ifdef __MINGW32__
-typedef unsigned char boolean; /* 0 or 1 */
-#define SKIP_BOOLEAN
-#endif
-
 #define WIN32_LEAN_AND_MEAN
 
 #include <windows.h>