diff options
| author | Christoph Gohlke <cgohlke@uci.edu> | 2015-08-02 00:26:25 -0700 |
|---|---|---|
| committer | Christoph Gohlke <cgohlke@uci.edu> | 2015-08-02 00:26:25 -0700 |
| commit | b5a91f25c0a66f92883ee554f725e40dabdf3419 (patch) | |
| tree | c772657d31872cacbd3b77a82df85d8f6ed2fd52 | |
| parent | 2c99f44925b77e7d8934b4754455b42d47065340 (diff) | |
| download | numpy-b5a91f25c0a66f92883ee554f725e40dabdf3419.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 8f5d8e6c7..38f182ddb 100644 --- a/numpy/core/include/numpy/npy_math.h +++ b/numpy/core/include/numpy/npy_math.h @@ -163,7 +163,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) @@ -194,7 +194,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)) |