diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2022-07-10 09:20:05 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-10 09:20:05 -0600 |
| commit | 8b8ca096728916c5f07f8d7ce2de6df1816873a9 (patch) | |
| tree | 5970fbdf617f75eb7989742e7418ef4aed08109a /numpy/random | |
| parent | d3cb79922af428d4cf3244aa94025466459e31d8 (diff) | |
| parent | 467be385f57cfdf373ba076836054fee3a8218ca (diff) | |
| download | numpy-8b8ca096728916c5f07f8d7ce2de6df1816873a9.tar.gz | |
Merge pull request #21887 from matthew-brett/mingw-random-compile
BLD: Allow GCC compile on mingw-w64-based systems
Diffstat (limited to 'numpy/random')
| -rw-r--r-- | numpy/random/src/mt19937/mt19937.h | 2 | ||||
| -rw-r--r-- | numpy/random/src/pcg64/pcg64.h | 2 | ||||
| -rw-r--r-- | numpy/random/src/philox/philox.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/numpy/random/src/mt19937/mt19937.h b/numpy/random/src/mt19937/mt19937.h index 1b39e0b64..83129336a 100644 --- a/numpy/random/src/mt19937/mt19937.h +++ b/numpy/random/src/mt19937/mt19937.h @@ -2,7 +2,7 @@ #include <math.h> #include <stdint.h> -#ifdef _WIN32 +#if defined(_WIN32) && !defined (__MINGW32__) #define inline __forceinline #endif diff --git a/numpy/random/src/pcg64/pcg64.h b/numpy/random/src/pcg64/pcg64.h index 90a83fd5e..fb8281201 100644 --- a/numpy/random/src/pcg64/pcg64.h +++ b/numpy/random/src/pcg64/pcg64.h @@ -52,7 +52,7 @@ #include <inttypes.h> -#ifdef _WIN32 +#if defined(_WIN32) && !defined (__MINGW32__) #include <stdlib.h> #define inline __forceinline #endif diff --git a/numpy/random/src/philox/philox.h b/numpy/random/src/philox/philox.h index 8844acc15..81e034a47 100644 --- a/numpy/random/src/philox/philox.h +++ b/numpy/random/src/philox/philox.h @@ -33,7 +33,7 @@ static NPY_INLINE uint64_t mulhilo64(uint64_t a, uint64_t b, uint64_t *hip) { return (uint64_t)product; } #else -#if defined(_WIN32) +#if defined(_WIN32) && !defined(__MINGW32__) #include <intrin.h> #if defined(_WIN64) && defined(_M_AMD64) #pragma intrinsic(_umul128) |