Skip to content

C
core
Kaydet (Commit) e35cffb3 authored tarafından David Tardon's avatar David Tardon
Dosyalara gözat
Seçenekler

solar types are gone--remove this hack

üst 3d9981af
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 9 deletions
connectivity/source/drivers/adabas/BDriver.cxx
Dosyayı görüntüle @ e35cffb3
...@@ -29,20 +29,11 @@ ...@@ -29,20 +29,11 @@
// MARKER(update_precomp.py): autogen include statement, do not remove // MARKER(update_precomp.py): autogen include statement, do not remove
#include "precompiled_connectivity.hxx" #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 #ifdef SYSTEM_ODBC_HEADERS
#include <sqltypes.h> #include <sqltypes.h>
#else #else
#include <odbc/sqltypes.h> #include <odbc/sqltypes.h>
#endif #endif
#undef ULONG
#undef BOOL
#include <unotools/tempfile.hxx> #include <unotools/tempfile.hxx>
#include <sal/macros.h> #include <sal/macros.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment