solar types are gone--remove this hack
This commit is contained in:
parent
3d9981af0d
commit
e35cffb37a
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user