summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-01-25 21:00:58 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-01-25 21:06:27 +0200
commit744c045749728a9a967a590a79553d895809836a (patch)
treec9f68c323f18652aaff29b1098ad9df886f4bacf
parent29029a3eeadc8484d8c7ddbfd43e62c436ac4074 (diff)
Add informative comment about ULONG and BOOL screwup in sqltypes.h
-rw-r--r--connectivity/source/drivers/adabas/BDriver.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 3db46ed555..25f554f73a 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"