From c4704dc27136573cb509c138b4a6c03ac9c2d74f Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Mon, 13 Nov 2006 12:01:37 +0000 Subject: [PATCH] fix conflict with BOOL definition in X11/Xmd.h (bug 1592325); also unified all different BOOL fixes in a single one git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- include/wx/db.h | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/include/wx/db.h b/include/wx/db.h index f678c71452..b7b41c647b 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -73,24 +73,16 @@ typedef UCHAR SQLTCHAR; #endif #endif - #else - #if defined( __WXMOTIF__ ) && defined( __VMS ) - // solves a type definition mismatch between IODBC and MOTIF on OpenVMS - #define BOOL int - #endif - #if defined( __DARWIN__ ) - // solves a type definition mismatch between IODBC and Cocoa - #define BOOL signed char - #endif + #else // !wxUSE_BUILTIN_IODBC + // SQL headers define BOOL if it's not defined yet but BOOL is also + // defined in many other places on other systems (Motif, at least on + // OpenVMS; Cocoa and X11) so prevent the problem by defining it before + // including these headers + #define BOOL int #include #include - //#if wxUSE_UNICODE - // #include - //#endif - #if defined( __WXMOTIF__ ) && defined( __VMS ) - #undef BOOL - #endif - #endif + #undef BOOL + #endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC } #endif -- 2.45.2