nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Qt on Win32: resolve conflict over boolean type

Browse Source
This commit is contained in:
Ray Chason
2018-09-10 21:13:14 +03:00
committed by Pasi Kallinen
parent 8dbaafbb7b
commit 41fdc79b7b
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/global.h
+5
View File
@@ -58,9 +58,14 @@
* since otherwise comparisons with signed quantities are done incorrectly * since otherwise comparisons with signed quantities are done incorrectly
*/ */
typedef schar xchar; 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 #ifndef SKIP_BOOLEAN
typedef xchar boolean; /* 0 or 1 */ typedef xchar boolean; /* 0 or 1 */
#endif #endif
#endif
#ifndef TRUE /* defined in some systems' native include files */ #ifndef TRUE /* defined in some systems' native include files */
#define TRUE ((boolean) 1) #define TRUE ((boolean) 1)