Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix conflict with BOOL definition in X11/Xmd.h (bug 1592325); also unified all different BOOL fixes in a single one

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@43393 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2006-11-13 12:01:37 +00:00
parent 613a0c4c55
commit c4704dc271
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/wx/db.h
View File

@@ -73,24 +73,16 @@
typedef UCHAR SQLTCHAR; typedef UCHAR SQLTCHAR;
#endif #endif
#endif #endif
#else #else // !wxUSE_BUILTIN_IODBC
#if defined( __WXMOTIF__ ) && defined( __VMS ) // SQL headers define BOOL if it's not defined yet but BOOL is also
// solves a type definition mismatch between IODBC and MOTIF on OpenVMS // defined in many other places on other systems (Motif, at least on
#define BOOL int // OpenVMS; Cocoa and X11) so prevent the problem by defining it before
#endif // including these headers
#if defined( __DARWIN__ ) #define BOOL int
// solves a type definition mismatch between IODBC and Cocoa
#define BOOL signed char
#endif
#include <sql.h> #include <sql.h>
#include <sqlext.h> #include <sqlext.h>
//#if wxUSE_UNICODE #undef BOOL
// #include <sqlucode.h> #endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC
//#endif
#if defined( __WXMOTIF__ ) && defined( __VMS )
#undef BOOL
#endif
#endif
} }
#endif #endif