diff options
| author | David Tardon <dtardon@redhat.com> | 2011-03-19 12:25:11 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-03-19 12:25:11 +0100 |
| commit | e35cffb37a792b78f8dbcd85b329fa88097b1ea5 (patch) | |
| tree | d59b9caa689fc2c565a0264ea1fdd554ccf82a3d | |
| parent | 3d9981af0da5f612250c8cb88ee716da8d067e75 (diff) | |
solar types are gone--remove this hack
| -rwxr-xr-x | connectivity/source/drivers/adabas/BDriver.cxx | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx index bb72894d621c..186e7263a7de 100755 --- a/connectivity/source/drivers/adabas/BDriver.cxx +++ b/connectivity/source/drivers/adabas/BDriver.cxx @@ -29,20 +29,11 @@ // 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> #else #include <odbc/sqltypes.h> #endif -#undef ULONG -#undef BOOL #include <unotools/tempfile.hxx> #include <sal/macros.h> |