X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/f24a3804a83c10ff288f03a2e1f311833d2a663e..ba5787676d002f76b4c3944cb598b626f10f058d:/include/wx/db.h diff --git a/include/wx/db.h b/include/wx/db.h index 41c63267fe..7c3924b57d 100644 --- a/include/wx/db.h +++ b/include/wx/db.h @@ -57,7 +57,7 @@ //#endif #include "odbcinst.h" #else - #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) ) + #if defined(__WINDOWS__) && ( defined(HAVE_W32API_H) || defined(__BORLANDC__) || defined (__DMC__)) #include "wx/msw/wrapwin.h" #endif extern "C" { @@ -73,20 +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 + #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