Qt on Win32: resolve conflict over boolean type
This commit is contained in:
committed by
Pasi Kallinen
parent
8dbaafbb7b
commit
41fdc79b7b
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user