diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-27 20:27:32 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-09-27 20:36:26 +0200 |
| commit | 6b7d31810b5198ab17ddaccda41e94b253ff2a25 (patch) | |
| tree | 9c1e8fde750dfa79ea8d597a43f79c546f5517df | |
| parent | 69241123ed87d6b9974f9fb45e54377efcf7cead (diff) | |
error C2513: 'const short' : no variable declared before '='
com/sun/star/beans/PropertyAttribute.hdl's OPTIONAL had a clash with some of
the Windows headers.
Change-Id: I26a4fdcd1a1d53596b82ebdaf609e0a0e9309697
| -rw-r--r-- | include/connectivity/odbc.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/connectivity/odbc.hxx b/include/connectivity/odbc.hxx index d241ddcc209c..bf66edd60b38 100644 --- a/include/connectivity/odbc.hxx +++ b/include/connectivity/odbc.hxx @@ -28,6 +28,8 @@ #pragma warning(disable:4005) #endif +#include <prewin.h> + // just to go with calling convention of windows #if SYSTEM_ODBC_HEADERS #include <windows.h> @@ -54,6 +56,8 @@ #define SDB_ODBC_CHAR UCHAR +#include <postwin.h> + #endif |