X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/fcdc9f6e1f44c52327911c19612cd4c13c753a03..9f41bf0eb04f4cdffd98a9ff38653c403b150d29:/include/wx/db.h

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 <sql.h>
         #include <sqlext.h>
-        //#if wxUSE_UNICODE
-        //    #include <sqlucode.h>
-        //#endif
-      #if defined( __WXMOTIF__ ) && defined( __VMS )
-      #undef BOOL
-      #endif
-    #endif
+        #undef BOOL
+    #endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC
     }
 #endif