summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tlillqvist@novell.com>2011-01-25 01:22:37 +0200
committerTor Lillqvist <tlillqvist@novell.com>2011-01-25 01:22:44 +0200
commitd1dedcc6fe58c2588183d5aa994e44d7e6f70a15 (patch)
treedbb58875a47eaaf60aac700557223447ce3497b3
parente9737f2b0214336176f79485cc4318e2a6ddc232 (diff)
Work around compilation errors on 64-bit Windows
Fixes clashes between ULONG and BOOL in sqltypes.h and solar.h.
-rw-r--r--connectivity/source/drivers/adabas/BDriver.cxx5
1 files changed, 5 insertions, 0 deletions
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 5c8bab94d7..70fbe4e440 100644
--- a/connectivity/source/drivers/adabas/BDriver.cxx
+++ b/connectivity/source/drivers/adabas/BDriver.cxx
@@ -28,6 +28,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_connectivity.hxx"
+#include <tools/solar.h>
+#define ULONG ODBC_ULONG
+#include <odbc/sqltypes.h>
+#undef ULONG
+#undef BOOL
#include <unotools/tempfile.hxx>
#include <sal/macros.h>
#include "adabas/BDriver.hxx"