From affe623a1626575fded6725850e11fd1317a6291 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Fri, 7 Nov 2008 22:45:47 +0000 Subject: [PATCH] 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 --- include/wx/db.h | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/wx/db.h b/include/wx/db.h index d8bc4acf84..47d18caea6 100644 --- 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 - #include - #undef BOOL + #ifndef BOOL + #define BOOL int + #include + #include + #undef BOOL + #else + #include + #include + #endif #endif // wxUSE_BUILTIN_IODBC/!wxUSE_BUILTIN_IODBC } #endif