diff options
| author | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-25 21:00:58 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@novell.com> | 2011-01-25 21:06:27 +0200 |
| commit | 60ba48a1b4aee5d80127df2450bae1312aa1881f (patch) | |
| tree | e4084fdc9f55b8c2a23d89cb19956b2032213b7e | |
| parent | e3264718d156fb21188a9f9fe94640ca1cc8c72d (diff) | |
Add informative comment about ULONG and BOOL screwup in sqltypes.h
| -rw-r--r-- | connectivity/source/drivers/adabas/BDriver.cxx | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/connectivity/source/drivers/adabas/BDriver.cxx b/connectivity/source/drivers/adabas/BDriver.cxx index d0184ad20c44..2ef48549001a 100644 --- a/connectivity/source/drivers/adabas/BDriver.cxx +++ b/connectivity/source/drivers/adabas/BDriver.cxx @@ -28,7 +28,13 @@ // 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> @@ -37,6 +43,7 @@ #endif #undef ULONG #undef BOOL + #include <unotools/tempfile.hxx> #include <sal/macros.h> #include "adabas/BDriver.hxx" |