diff options
| -rw-r--r-- | numpy/core/src/private/npy_config.h | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h index 237dc94ab..4ccaae517 100644 --- a/numpy/core/src/private/npy_config.h +++ b/numpy/core/src/private/npy_config.h @@ -2,6 +2,7 @@ #define _NPY_NPY_CONFIG_H_ #include "config.h" +#include "_numpyconfig.h" /* Disable broken MS math functions */ #if defined(_MSC_VER) || defined(__MINGW32_VERSION) @@ -10,7 +11,7 @@ #endif /* Safe to use ldexp and frexp for long double for MSVC builds */ -#if (SIZEOF_LONG_DOUBLE == SIZEOF_DOUBLE) || defined(_MSC_VER) +#if (NPY_SIZEOF_LONGDOUBLE == NPY_SIZEOF_DOUBLE) || defined(_MSC_VER) #ifdef HAVE_LDEXP #define HAVE_LDEXPL 1 #endif @@ -24,21 +25,4 @@ #undef HAVE_ATAN2 #endif -/* - * On Mac OS X, because there is only one configuration stage for all the archs - * in universal builds, any macro which depends on the arch needs to be - * harcoded - */ -#ifdef __APPLE__ - #undef SIZEOF_LONG - #undef SIZEOF_PY_INTPTR_T - - #ifdef __LP64__ - #define SIZEOF_LONG 8 - #define SIZEOF_PY_INTPTR_T 8 - #else - #define SIZEOF_LONG 4 - #define SIZEOF_PY_INTPTR_T 4 - #endif -#endif #endif |