Browse Source

odbc db driver: fix compilation issue on Cygwin (64bit)

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@67032 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 9 years ago
parent
commit
b937e83513
2 changed files with 9 additions and 2 deletions
  1. 3 1
      db/drivers/odbc/describe.c
  2. 6 1
      db/drivers/odbc/odbc.h

+ 3 - 1
db/drivers/odbc/describe.c

@@ -1,9 +1,11 @@
+#include <stdio.h>
+
 #include <grass/dbmi.h>
 #include <grass/dbmi.h>
 #include <grass/datetime.h>
 #include <grass/datetime.h>
+
 #include "odbc.h"
 #include "odbc.h"
 #include "globals.h"
 #include "globals.h"
 #include "proto.h"
 #include "proto.h"
-#include <stdio.h>
 
 
 int set_column_type(dbColumn * column, int otype);
 int set_column_type(dbColumn * column, int otype);
 
 

+ 6 - 1
db/drivers/odbc/odbc.h

@@ -2,7 +2,12 @@
 #define	_ODBC_H_
 #define	_ODBC_H_
 
 
 #ifdef __MINGW32__
 #ifdef __MINGW32__
-#include <windows.h>
+ #include <windows.h>
+#endif
+
+#ifdef __CYGWIN__
+ #include <w32api/intrin.h>
+ #include <w32api/wtypes.h>
 #endif
 #endif
 
 
 /* configure checks for sql.h and stores in $(ODBCINC) */
 /* configure checks for sql.h and stores in $(ODBCINC) */