From e35cffb37a792b78f8dbcd85b329fa88097b1ea5 Mon Sep 17 00:00:00 2001
From: David Tardon <dtardon@redhat.com>
Date: Sat, 19 Mar 2011 12:25:11 +0100
Subject: [PATCH] solar types are gone--remove this hack

---
 connectivity/source/drivers/adabas/BDriver.cxx | 9 ---------
 1 file changed, 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>