[Libreoffice-commits] core.git: include/connectivity

[Miklos Vajna]

 include/connectivity/odbc.hxx |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 6b7d31810b5198ab17ddaccda41e94b253ff2a25
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Sat Sep 27 20:27:32 2014 +0200

    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

diff --git a/include/connectivity/odbc.hxx b/include/connectivity/odbc.hxx
index d241ddc..bf66edd 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