first pass at fixing issue for Theuns #19

libspatialindex · Feb 28, 2013 · 795245f · 795245f
1 parent 9a5a2f4
commit 795245f
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/include/spatialindex/tools/Tools.h b/include/spatialindex/tools/Tools.h
@@ -27,7 +27,7 @@
 
 #pragma once
 
-#if defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64
+#if (defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64) && !defined __GNUC__
   typedef __int8 int8_t;
   typedef __int16 int16_t;
   typedef __int32 int32_t;
@@ -44,7 +44,7 @@
   #include <stdint.h>
 #endif
 
-#if defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64
+#if (defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64) && !defined __GNUC__
   #ifdef SPATIALINDEX_CREATE_DLL
     #define SIDX_DLL __declspec(dllexport)
   #else

diff --git a/src/tools/Tools.cc b/src/tools/Tools.cc
@@ -35,6 +35,11 @@
 
 #include <cstring>
 
+#if (defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64)
+#include <direct.h>
+#define mkdir _mkdir
+#endif
+
 #if HAVE_PTHREAD_H
 #if !defined(_POSIX_THREADS)
 #include <sched.h>	// for sched_yield()

diff --git a/test/mvrtree/Exhaustive.cc b/test/mvrtree/Exhaustive.cc
@@ -42,7 +42,7 @@ using namespace std;
 #define INSERT 1
 #define QUERY 2
 
-#if defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64
+#if (defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64) && !defined __GNUC__
 
 #if _MSC_VER <= 1500
   typedef __int8 int8_t;

diff --git a/test/rtree/Exhaustive.cc b/test/rtree/Exhaustive.cc
@@ -33,7 +33,7 @@
 #define DELETE 0
 #define QUERY 2
 
-#if defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64
+#if (defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64) && !defined __GNUC__
 	typedef __int8 int8_t;
 	typedef __int16 int16_t;
 	typedef __int32 int32_t;

diff --git a/test/tprtree/Exhaustive.cc b/test/tprtree/Exhaustive.cc
@@ -39,7 +39,7 @@ using namespace std;
 #define DELETE 0
 #define QUERY 2
 
-#if defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64
+#if (defined _WIN32 || defined _WIN64 || defined WIN32 || defined WIN64) && !defined __GNUC__
 #if _MSC_VER <= 1500
   typedef __int8 int8_t;
   typedef __int16 int16_t;