diff options
| author | Christoph Gohlke <cgohlke@uci.edu> | 2015-08-02 00:26:25 -0700 |
|---|---|---|
| committer | Matthew Brett <matthew.brett@gmail.com> | 2015-09-21 09:51:49 -0700 |
| commit | 147b82829b41337d7d5db0f19037ba41af9eea48 (patch) | |
| tree | f13207d1f6fb008f08f8653f36bdbaf72d6ace0d | |
| parent | fad36c1114479db40a3fe51358c31d2e4a98acab (diff) | |
| download | numpy-147b82829b41337d7d5db0f19037ba41af9eea48.tar.gz | |
BLD: enable C99 isnan and isinf for msvc14
| -rw-r--r-- | numpy/core/include/numpy/npy_math.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/numpy/core/include/numpy/npy_math.h b/numpy/core/include/numpy/npy_math.h index b7920460d..461651b08 100644 --- a/numpy/core/include/numpy/npy_math.h +++ b/numpy/core/include/numpy/npy_math.h @@ -164,7 +164,7 @@ double npy_spacing(double x); #ifndef NPY_HAVE_DECL_ISNAN #define npy_isnan(x) ((x) != (x)) #else - #ifdef _MSC_VER + #if defined(_MSC_VER) && (_MSC_VER < 1900) #define npy_isnan(x) _isnan((x)) #else #define npy_isnan(x) isnan(x) @@ -195,7 +195,7 @@ double npy_spacing(double x); #ifndef NPY_HAVE_DECL_ISINF #define npy_isinf(x) (!npy_isfinite(x) && !npy_isnan(x)) #else - #ifdef _MSC_VER + #if defined(_MSC_VER) && (_MSC_VER < 1900) #define npy_isinf(x) (!_finite((x)) && !_isnan((x))) #else #define npy_isinf(x) isinf((x)) |