[GRASS-SVN] r67073 - grass/branches/releasebranch_7_0/db/drivers/odbc

[svn_grass at osgeo.org]

Author: martinl
Date: 2015-12-12 04:39:11 -0800 (Sat, 12 Dec 2015)
New Revision: 67073

Modified:
   grass/branches/releasebranch_7_0/db/drivers/odbc/describe.c
   grass/branches/releasebranch_7_0/db/drivers/odbc/odbc.h
Log:
odbc db driver: fix compilation issue on Cygwin (64bit)
     (merge r67032 from trunk)


Modified: grass/branches/releasebranch_7_0/db/drivers/odbc/describe.c
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/odbc/describe.c	2015-12-12 12:36:50 UTC (rev 67072)
+++ grass/branches/releasebranch_7_0/db/drivers/odbc/describe.c	2015-12-12 12:39:11 UTC (rev 67073)
@@ -1,9 +1,11 @@
+#include <stdio.h>
+
 #include <grass/dbmi.h>
 #include <grass/datetime.h>
+
 #include "odbc.h"
 #include "globals.h"
 #include "proto.h"
-#include <stdio.h>
 
 int set_column_type(dbColumn * column, int otype);
 

Modified: grass/branches/releasebranch_7_0/db/drivers/odbc/odbc.h
===================================================================
--- grass/branches/releasebranch_7_0/db/drivers/odbc/odbc.h	2015-12-12 12:36:50 UTC (rev 67072)
+++ grass/branches/releasebranch_7_0/db/drivers/odbc/odbc.h	2015-12-12 12:39:11 UTC (rev 67073)
@@ -2,9 +2,14 @@
 #define	_ODBC_H_
 
 #ifdef __MINGW32__
-#include <windows.h>
+ #include <windows.h>
 #endif
 
+#ifdef __CYGWIN__
+ #include <w32api/intrin.h>
+ #include <w32api/wtypes.h>
+#endif
+
 /* configure checks for sql.h and stores in $(ODBCINC) */
 #include <sql.h>
 #include <sqlext.h>