[Libreoffice-commits] .: connectivity/source

[Tor Lillqvist]

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

New commits:
commit d1dedcc6fe58c2588183d5aa994e44d7e6f70a15
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 25 01:22:37 2011 +0200

    Work around compilation errors on 64-bit Windows
    
    Fixes clashes between ULONG and BOOL in sqltypes.h and solar.h.

diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 5c8bab9..70fbe4e 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"