[Libreoffice-commits] .: connectivity/source

[Tor Lillqvist]

 connectivity/source/drivers/adabas/BDriver.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit 744c045749728a9a967a590a79553d895809836a
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 25 21:00:58 2011 +0200

    Add informative comment about ULONG and BOOL screwup in sqltypes.h

diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 3db46ed..25f554f 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -28,7 +28,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_connectivity.hxx"
+
 #include <tools/solar.h>
+
+// Include odbc/sqltypes.h specifically and early to handle its nasty
+// re-definitions of BOOL and typedef of ULONG that clash horribly
+// with the solar.h stuff (which itself already clashes with <windows.h>).
+
 #define ULONG ODBC_ULONG
 #ifdef SYSTEM_ODBC_HEADERS
 #include <sqltypes.h>
@@ -37,6 +43,7 @@
 #endif
 #undef ULONG
 #undef BOOL
+
 #include <unotools/tempfile.hxx>
 #include <sal/macros.h>
 #include "adabas/BDriver.hxx"