diff options
| author | Charles Harris <charlesr.harris@gmail.com> | 2015-08-03 12:03:58 -0600 |
|---|---|---|
| committer | Charles Harris <charlesr.harris@gmail.com> | 2015-08-03 12:03:58 -0600 |
| commit | 4091facf55e03d356a5d7ce219ae0c0494920df3 (patch) | |
| tree | 5b5e8805d9cd285f1739efbc0125c47b63071d42 | |
| parent | 3ea9cc72aca9d74a360a11fb8cb57a8cf71055d2 (diff) | |
| download | numpy-4091facf55e03d356a5d7ce219ae0c0494920df3.tar.gz | |
BLD: Move Intel POWL blacklist.
Update patch from Intel by moving POWL blacklist from npy_math_private.h
to npy_config.h blacklists.
| -rw-r--r-- | numpy/core/src/npymath/npy_math_private.h | 6 | ||||
| -rw-r--r-- | numpy/core/src/private/npy_config.h | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/numpy/core/src/npymath/npy_math_private.h b/numpy/core/src/npymath/npy_math_private.h index 7e699321e..6c44d0ba2 100644 --- a/numpy/core/src/npymath/npy_math_private.h +++ b/numpy/core/src/npymath/npy_math_private.h @@ -540,11 +540,5 @@ typedef union { } __npy_clongdouble_to_c99_cast; #endif /* !NPY_USE_C99_COMPLEX */ -/* Intel C for Windows uses POW for 64 bits longdouble*/ -#if defined(_MSC_VER) && defined(__INTEL_COMPILER) -#if defined(HAVE_POWL) && (NPY_SIZEOF_LONGDOUBLE == 8) -#undef HAVE_POWL -#endif -#endif /* _MSC_VER and __INTEL_COMPILER */ #endif /* !_NPY_MATH_PRIVATE_H_ */ diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h index 3b369f2e4..fa20eb4f3 100644 --- a/numpy/core/src/private/npy_config.h +++ b/numpy/core/src/private/npy_config.h @@ -61,6 +61,15 @@ #endif + +/* Intel C for Windows uses POW for 64 bits longdouble*/ +#if defined(_MSC_VER) && defined(__INTEL_COMPILER) +#if defined(HAVE_POWL) && (NPY_SIZEOF_LONGDOUBLE == 8) +#undef HAVE_POWL +#endif +#endif /* defined(_MSC_VER) && defined(__INTEL_COMPILER) */ + + /* Disable broken gnu trig functions on linux */ #if defined(__linux__) && defined(__GNUC__) |