[Libreoffice-commits] .: connectivity/source

[David Tardon]

 connectivity/source/drivers/adabas/BDriver.cxx |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit dfa833215b5ad25790ed4827353cbd4fde42e663
Author: David Tardon <dtardon at redhat.com>
Date:   Sat Mar 19 12:25:11 2011 +0100

    solar types are gone--remove this hack

diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx
index 7a8c5be..22fc9be 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>