strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Tor Lillqvist 2011-01-25 20:54:24 +02:00
parent 7e857dc781
commit 03bee2a75b
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
dbaccess/source/ui/dlg/odbcconfig.cxx
View file

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