Merge pull request #2 from IntelPython/fix-win-py27

define preprocessor variable for inline keyword, and define it empty …
IntelPython · Apr 21, 2019 · 2c6751c · 2c6751c
2 parents 3f9fed6 + ac0d605
commit 2c6751c
Showing 1 changed file with 22 additions and 12 deletions.
diff --git a/mkl/_mklinitmodule.c b/mkl/_mklinitmodule.c
@@ -23,19 +23,15 @@ static struct PyMethodDef methods[] = {
     {NULL, NULL, 0, NULL}
 };
 
-static inline void _set_mkl_ilp64() {
-#ifdef USING_MKL_RT
-    int i = mkl_set_interface_layer(MKL_INTERFACE_ILP64);
+#if defined(_MSC_VER) && (_MSC_VER <= 1500)
+#define MKL_SERVICE_INLINE
+#else
+#define MKL_SERVICE_INLINE inline
 #endif
-    return;
-}
 
-static inline void _set_mkl_lp64() {
-#ifdef USING_MKL_RT
-    int i = mkl_set_interface_layer(MKL_INTERFACE_LP64);
-#endif
-    return;
-}
+static MKL_SERVICE_INLINE void _set_mkl_ilp64();
+static MKL_SERVICE_INLINE void _set_mkl_lp64();
+static MKL_SERVICE_INLINE void _set_mkl_interface();
 
 static void _preload_threading_layer() {
 #if FORCE_PRELOADING
@@ -112,7 +108,21 @@ static void _preload_threading_layer() {
     return;
 }
 
-static inline void _set_mkl_interface() {
+static MKL_SERVICE_INLINE void _set_mkl_ilp64() {
+#ifdef USING_MKL_RT
+    int i = mkl_set_interface_layer(MKL_INTERFACE_ILP64);
+#endif
+    return;
+}
+
+static MKL_SERVICE_INLINE void _set_mkl_lp64() {
+#ifdef USING_MKL_RT
+    int i = mkl_set_interface_layer(MKL_INTERFACE_LP64);
+#endif
+    return;
+}
+
+static MKL_SERVICE_INLINE void _set_mkl_interface() {
     _set_mkl_lp64();
     _preload_threading_layer();
 }