diff options
| author | Christoph Gohlke <cgohlke@uci.edu> | 2015-08-02 00:32:15 -0700 |
|---|---|---|
| committer | Christoph Gohlke <cgohlke@uci.edu> | 2015-08-02 00:32:15 -0700 |
| commit | 15fc8f1bc7dc68d3fd2811b6a781f9a40290f275 (patch) | |
| tree | c4e2284ae23501f254fc3d8cec958107eb6c51eb | |
| parent | b5a91f25c0a66f92883ee554f725e40dabdf3419 (diff) | |
| download | numpy-15fc8f1bc7dc68d3fd2811b6a781f9a40290f275.tar.gz | |
BLD: disable broken msvc14 trigonometric functions
| -rw-r--r-- | numpy/core/src/private/npy_config.h | 19 |
1 files changed, 18 insertions, 1 deletions
diff --git a/numpy/core/src/private/npy_config.h b/numpy/core/src/private/npy_config.h index 580b00706..3b369f2e4 100644 --- a/numpy/core/src/private/npy_config.h +++ b/numpy/core/src/private/npy_config.h @@ -32,7 +32,7 @@ #endif /* Disable broken MS math functions */ -#if defined(_MSC_VER) || defined(__MINGW32_VERSION) +#if (defined(_MSC_VER) && (_MSC_VER < 1900)) || defined(__MINGW32_VERSION) #undef HAVE_ATAN2 #undef HAVE_ATAN2F @@ -44,6 +44,23 @@ #endif +#if defined(_MSC_VER) && (_MSC_VER == 1900) + +#undef HAVE_CASIN +#undef HAVE_CASINF +#undef HAVE_CASINL +#undef HAVE_CASINH +#undef HAVE_CASINHF +#undef HAVE_CASINHL +#undef HAVE_CATAN +#undef HAVE_CATANF +#undef HAVE_CATANL +#undef HAVE_CATANH +#undef HAVE_CATANHF +#undef HAVE_CATANHL + +#endif + /* Disable broken gnu trig functions on linux */ #if defined(__linux__) && defined(__GNUC__) |