diff options
| author | David Tardon <dtardon@redhat.com> | 2011-03-19 14:46:15 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2011-03-19 14:46:54 +0100 |
| commit | 9956e54c3f74045a31f49921af427f1add455754 (patch) | |
| tree | c2f2392759f2318d0626c1d9bd86bc2427223c8a | |
| parent | 602ffda305408ea4dc44a45658bc0c75dbb825ec (diff) | |
solar types are gone--remove this hack
| -rw-r--r-- | dbaccess/source/ui/dlg/odbcconfig.cxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx index 99619c004..83e3d1ca8 100644 --- a/dbaccess/source/ui/dlg/odbcconfig.cxx +++ b/dbaccess/source/ui/dlg/odbcconfig.cxx @@ -31,18 +31,11 @@ #include "odbcconfig.hxx" -// 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 <rtl/bootstrap.hxx> #include <rtl/ustring.hxx> |