don't undefine BOOL if it's already defined (closes #10167)

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_8_BRANCH@56697 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
2008-11-07 22:45:47 +00:00
parent de03ba59b5
commit affe623a16
1 changed files with 9 additions and 4 deletions
--- a/include/wx/db.h
+++ b/include/wx/db.h
@@ -78,10 +78,15 @@
        // 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>
-        #undef BOOL
+        #ifndef BOOL
+            #define BOOL int
+            #include <sql.h>
+            #include <sqlext.h>
+            #undef BOOL
+        #else
+            #include <sql.h>
+            #include <sqlext.h>
+        #endif
    #endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC
    }
 #endif