mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

solar types are gone--remove this hack

Browse Source
This commit is contained in:
David Tardon 2011-03-19 12:25:11 +01:00
parent 3d9981af0d
commit e35cffb37a
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
connectivity/source/drivers/adabas/BDriver.cxx
View File

@ -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>