BLD: Change inline behavior on Windows

Sheppard, Kevin · Sheppard, Kevin · commit 1301c9acaacd · 2016-02-03T16:52:59.000-05:00
Add compile flags for Windows to change inline behavior
Force inlineing
diff --git a/randomstate/interface/dSFMT/dSFMT-shim.h b/randomstate/interface/dSFMT/dSFMT-shim.h
@@ -2,7 +2,7 @@
 
 #ifdef _WIN32
 #include "../../src/common/stdint.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <stdint.h>
 #endif
diff --git a/randomstate/interface/mlfg-1279-861/mlfg-1279-861-shim.h b/randomstate/interface/mlfg-1279-861/mlfg-1279-861-shim.h
@@ -1,7 +1,7 @@
 
 #ifdef _WIN32
 #include "../../src/common/stdint.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <stdint.h>
 #endif
diff --git a/randomstate/interface/mrg32k3a/mrg32k3a-shim.h b/randomstate/interface/mrg32k3a/mrg32k3a-shim.h
@@ -1,6 +1,6 @@
 #ifdef _WIN32
 #include "../../src/common/stdint.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <stdint.h>
 #endif
diff --git a/randomstate/interface/pcg-64/pcg-64-shim.h b/randomstate/interface/pcg-64/pcg-64-shim.h
@@ -2,7 +2,7 @@
 
 #ifdef _WIN32
 #include "../../src/common/inttypes.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <inttypes.h>
 #endif
diff --git a/randomstate/interface/random-kit/random-kit-shim.h b/randomstate/interface/random-kit/random-kit-shim.h
@@ -2,7 +2,7 @@
 
 #ifdef _WIN32
 #include "../../src/common/stdint.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <stdint.h>
 #endif
diff --git a/randomstate/interface/xorshift1024/xorshift1024-shim.h b/randomstate/interface/xorshift1024/xorshift1024-shim.h
@@ -1,6 +1,6 @@
 #ifdef _WIN32
 #include "../../src/common/stdint.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <stdint.h>
 #endif
diff --git a/randomstate/interface/xorshift128/xorshift128-shim.h b/randomstate/interface/xorshift128/xorshift128-shim.h
@@ -1,6 +1,6 @@
 #ifdef _WIN32
 #include "../../src/common/stdint.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <stdint.h>
 #endif
diff --git a/randomstate/src/dSFMT/dSFMT.h b/randomstate/src/dSFMT/dSFMT.h
@@ -101,14 +101,14 @@ typedef unsigned __int64 uint64_t;
 #    endif
 #    define DSFMT_UINT32_DEFINED
 #    if !defined(inline) && !defined(__cplusplus)
-#      define inline __inline
+#      define inline __forceinline
 #    endif
 #  endif
 #else
 #  include <inttypes.h>
 #  if !defined(inline) && !defined(__cplusplus)
 #    if defined(__GNUC__)
-#      define inline __inline__
+#      define inline __forceinline__
 #    else
 #      define inline
 #    endif
diff --git a/randomstate/src/mlfg-1279-861/mlfg-1279-861.h b/randomstate/src/mlfg-1279-861/mlfg-1279-861.h
@@ -1,6 +1,6 @@
 #ifdef _WIN32
 #include "../../src/common/stdint.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <stdint.h>
 #endif
diff --git a/randomstate/src/mrg32k3a/mrg32k3a.h b/randomstate/src/mrg32k3a/mrg32k3a.h
@@ -1,6 +1,6 @@
 #ifdef _WIN32
 #include "../../src/common/stdint.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <stdint.h>
 #endif
diff --git a/randomstate/src/pcg/pcg32.h b/randomstate/src/pcg/pcg32.h
@@ -1,6 +1,6 @@
 #ifdef _WIN32
 #include "../common/inttypes.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <inttypes.h>
 #endif
diff --git a/randomstate/src/pcg64-compat/pcg64.h b/randomstate/src/pcg64-compat/pcg64.h
@@ -27,7 +27,7 @@
 
 #ifdef _WIN32
 #include "../common/inttypes.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <inttypes.h>
 #endif
diff --git a/randomstate/src/random-kit/random-kit.h b/randomstate/src/random-kit/random-kit.h
@@ -6,7 +6,7 @@
 #endif
 
 #ifdef _WIN32
-#define inline __inline
+#define inline __forceinline
 #endif
 
 
diff --git a/randomstate/src/splitmix64/splitmix64.h b/randomstate/src/splitmix64/splitmix64.h
@@ -1,6 +1,6 @@
 #ifdef _WIN32
 #include "../common/inttypes.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <inttypes.h>
 #endif
diff --git a/randomstate/src/xorshift1024/xorshift1024.h b/randomstate/src/xorshift1024/xorshift1024.h
@@ -1,7 +1,7 @@
 #include <stddef.h>
 #ifdef _WIN32
 #include "../common/stdint.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <stdint.h>
 #endif
diff --git a/randomstate/src/xorshift128/xorshift128.h b/randomstate/src/xorshift128/xorshift128.h
@@ -2,7 +2,7 @@
 #include <math.h>
 #ifdef _WIN32
 #include "../common/stdint.h"
-#define inline __inline
+#define inline __forceinline
 #else
 #include <stdint.h>
 #endif
diff --git a/setup.py b/setup.py
@@ -23,11 +23,11 @@
 compile_rngs = rngs[:]
 
 extra_defs = [('_CRT_SECURE_NO_WARNINGS','1')] if os.name == 'nt' else []
-extra_link_args = ['Advapi32.lib', 'Kernel32.lib'] if os.name == 'nt' else []
+extra_link_args = ['/LTCG', 'Advapi32.lib', 'Kernel32.lib'] if os.name == 'nt' else []
 base_extra_compile_args = [] if os.name == 'nt' else ['-std=c99']
 if USE_SSE2:
     if os.name == 'nt':
-        base_extra_compile_args += ['/wd4146']
+        base_extra_compile_args += ['/wd4146','/GL']
         if struct.calcsize('P') < 8:
             base_extra_compile_args += ['/arch:SSE2']
     else:
