Factorize code for Windows compatibility.

Author: notoraptor

src/CMakeLists.txt

@@ -132,6 +132,7 @@ install(FILES ${headers} DESTINATION include/gpuarray)
 
 if(NOT UNIX)
   install(FILES gpuarray/wincompat/stdint.h DESTINATION include/gpuarray/wincompat)
+  install(FILES gpuarray/wincompat/util.h DESTINATION include/gpuarray/wincompat)
 endif()
 
 install(TARGETS gpuarray gpuarray-static

src/gpuarray/array.h

@@ -8,12 +8,6 @@
 #include <gpuarray/buffer.h>
 #include <gpuarray/util.h>
 
-#ifdef _MSC_VER
-#ifndef inline
-#define inline __inline
-#endif
-#endif
-
 #ifdef __cplusplus
 extern "C" {
 #endif

src/gpuarray/config.h

@@ -32,6 +32,7 @@
 #endif
 #define ssize_t intptr_t
 #define SSIZE_MAX INTPTR_MAX
+#include <gpuarray/wincompat/util.h>
 #else
 #include <sys/types.h>
 #include <stdint.h>

src/gpuarray/util.h

@@ -15,13 +15,6 @@ extern "C" {
 #include <gpuarray/elemwise.h>
 #include <gpuarray/types.h>
 
-/* MSVC 2008 does not support "inline". */
-#ifdef _MSC_VER
-#ifndef inline
-#define inline __inline
-#endif
-#endif
-
 /**
  * Registers a type with the kernel machinery.
  *

src/gpuarray/wincompat/util.h

@@ -0,0 +1,20 @@
+#ifndef WINCOMPAT_UTIL
+#define WINCOMPAT_UTIL
+
+#ifdef _MSC_VER
+    /* MSVC 2008 does not support "inline". */
+    #ifndef inline
+        #define inline __inline
+    #endif
+    #ifndef snprintf
+        #define snprintf _snprintf
+    #endif
+    #ifndef strdup
+        #define strdup _strdup
+    #endif
+    #ifndef alloca
+        #define alloca _alloca
+    #endif
+#endif
+
+#endif

src/gpuarray_buffer_opencl.c

@@ -15,10 +15,6 @@
 #include "loaders/libclblas.h"
 #include "loaders/libclblast.h"
 
-#ifdef _MSC_VER
-#define strdup _strdup
-#endif
-
 #define _unused(x) ((void)x)
 #define SSIZE_MIN (-(SSIZE_MAX-1))
 

src/util/error.h

@@ -6,13 +6,6 @@
 
 #include <gpuarray/error.h>
 
-/* MSVC 2008 does not support "inline". */
-#ifdef _MSC_VER
-#ifndef inline
-#define inline __inline
-#endif
-#endif
-
 /* 1024 - 4 for the int that goes after */
 #define ERROR_MSGBUF_LEN 1020