From: nhmall Date: Wed, 30 Oct 2019 21:36:04 +0000 (-0400) Subject: tinker with boolean for mingw32 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5e7e06ee7d20e9c19ebcb9b1e7ba72d8eeb06e0b;p=nethack tinker with boolean for mingw32 --- diff --git a/include/global.h b/include/global.h index 6e0f96ebf..feb9f75fb 100644 --- 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 d620973a8..28514b0ce 100644 --- 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