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 | cfeb82a6d89e28cfa545b7a5cbe7ad03f22bc678 (patch) | |
| tree | 2d81d45f54bc5ff7416b12328901f6a704eaa2d6 /dbaccess | |
| parent | fbcbfa9d34dc4b9645c6beebb9e0cb0973448427 (diff) | |
solar types are gone--remove this hack
Diffstat (limited to 'dbaccess')
| -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 22d68052aee0..3c04790c2f73 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> |