[Libreoffice-commits] .: dbaccess/source

[David Tardon]

 dbaccess/source/ui/dlg/odbcconfig.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 9956e54c3f74045a31f49921af427f1add455754
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Mar 19 14:46:15 2011 +0100

    solar types are gone--remove this hack

diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 99619c0..83e3d1c 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>