diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-25 01:22:37 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-25 01:22:44 +0200 |
| commit | dd901201e57ee4374f2a8f31b4de78b5489f91ac (patch) | |
| tree | 90cfd80642221c09ba1aaa4f9a46b6af81b9055d /connectivity/source | |
| parent | Use correct parameter types in ADO API calls (diff) | |
| download | core-dd901201e57ee4374f2a8f31b4de78b5489f91ac.tar.gz core-dd901201e57ee4374f2a8f31b4de78b5489f91ac.zip | |
Work around compilation errors on 64-bit Windows
Fixes clashes between ULONG and BOOL in sqltypes.h and solar.h.
Diffstat (limited to 'connectivity/source')
| -rw-r--r-- | connectivity/source/drivers/adabas/BDriver.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx index 261ce1ed8e1b..fc50f24d4156 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" |