[GRASS-SVN] r67032 - grass/trunk/db/drivers/odbc

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Dec 7 04:15:06 PST 2015


Author: martinl
Date: 2015-12-07 04:15:05 -0800 (Mon, 07 Dec 2015)
New Revision: 67032

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

Modified: grass/trunk/db/drivers/odbc/describe.c
===================================================================
--- grass/trunk/db/drivers/odbc/describe.c	2015-12-07 11:36:43 UTC (rev 67031)
+++ grass/trunk/db/drivers/odbc/describe.c	2015-12-07 12:15:05 UTC (rev 67032)
@@ -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/trunk/db/drivers/odbc/odbc.h
===================================================================
--- grass/trunk/db/drivers/odbc/odbc.h	2015-12-07 11:36:43 UTC (rev 67031)
+++ grass/trunk/db/drivers/odbc/odbc.h	2015-12-07 12:15:05 UTC (rev 67032)
@@ -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>



More information about the grass-commit mailing list