[Libreoffice-commits] .: dbaccess/source

[Tor Lillqvist]

 dbaccess/source/ui/dlg/odbcconfig.cxx |   10 ++++++++++
 1 file changed, 10 insertions(+)

New commits:
commit 0043c9690342c34ff3132bfaeab9375e05033ac3
Author: Tor Lillqvist <tlillqvist at novell.com>
Date:   Tue Jan 25 20:54:24 2011 +0200

    Workaround for <odbc/sqltypes.h> ULONG and BOOL screwup

diff --git a/dbaccess/source/ui/dlg/odbcconfig.cxx b/dbaccess/source/ui/dlg/odbcconfig.cxx
index 488be71..7f6860c 100644
--- a/dbaccess/source/ui/dlg/odbcconfig.cxx
+++ b/dbaccess/source/ui/dlg/odbcconfig.cxx
@@ -30,6 +30,16 @@
 #include "precompiled_dbaccess.hxx"
 
 #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
+#include <odbc/sqltypes.h>
+#undef ULONG
+#undef BOOL
+
 #include <rtl/bootstrap.hxx>
 #include <rtl/ustring.hxx>
 #include <rtl/ustrbuf.hxx>