summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorInessa Pawson <inessapawson@gmail.com>2022-01-02 22:00:21 -0500
committerGitHub <noreply@github.com>2022-01-02 22:00:21 -0500
commit8761fd623b02c7257cb4d4a7ea5d19d72a71dd93 (patch)
tree779f8605729fcdec022ee5e35dadbe33a402fef8
parentb598c4a81e0be749ef87a9332c7796a88b3d928a (diff)
parentd64df4553e7763208e150d6039dcb6fd3d5ef0be (diff)
downloadnumpy-8761fd623b02c7257cb4d4a7ea5d19d72a71dd93.tar.gz
Merge branch 'numpy:main' into CoC
-rw-r--r--numpy/core/src/npymath/npy_math_internal.h.src3
1 files changed, 3 insertions, 0 deletions
diff --git a/numpy/core/src/npymath/npy_math_internal.h.src b/numpy/core/src/npymath/npy_math_internal.h.src
index 5b418342f..15d35637f 100644
--- a/numpy/core/src/npymath/npy_math_internal.h.src
+++ b/numpy/core/src/npymath/npy_math_internal.h.src
@@ -54,6 +54,9 @@
* ====================================================
*/
#include "npy_math_private.h"
+#ifdef _MSC_VER
+# include <intrin.h> // for __popcnt
+#endif
/* Magic binary numbers used by bit_count
* For type T, the magic numbers are computed as follows: