summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2019-06-21 18:06:31 +0300
committerGitHub <noreply@github.com>2019-06-21 18:06:31 +0300
commit03069a156103c6db175afa9112d0cfebe882d91b (patch)
tree03d8b3ebccfc139aa405b3f724481cbe41134fc2
parent4a0abf48d9246131ee72cfbadf849e05d35267b1 (diff)
parente391672443259ebc2c1f31026b877a131f74546e (diff)
downloadnumpy-03069a156103c6db175afa9112d0cfebe882d91b.tar.gz
Merge pull request #13815 from bashtage/pcg64-intrin
MAINT: Correct intrinsic use on Windows
-rw-r--r--numpy/random/src/pcg64/pcg64.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/numpy/random/src/pcg64/pcg64.h b/numpy/random/src/pcg64/pcg64.h
index 20d64f8ab..f8578bfb3 100644
--- a/numpy/random/src/pcg64/pcg64.h
+++ b/numpy/random/src/pcg64/pcg64.h
@@ -53,6 +53,10 @@
#ifdef _WIN32
#include <stdlib.h>
#define inline __forceinline
+#if _MSC_VER >= 1900 && _M_AMD64
+#include <intrin.h>
+#pragma intrinsic(_umul128)
+#endif
#endif
#if __GNUC_GNU_INLINE__ && !defined(__cplusplus)