diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-03-04 22:19:21 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-03-04 22:19:21 +0100 |
commit | 6300317b15eb33409f652c603fb402417fe4eed7 (patch) | |
tree | 23125594387b4c64556f8c41e31dd0b80d9ca2ab | |
parent | f3654827368e6204608036353a0360e9e7c21e02 (diff) | |
download | vim-git-6300317b15eb33409f652c603fb402417fe4eed7.tar.gz |
patch 7.4.1487v7.4.1487
Problem: For WIN32 isinf() is defined as a macro.
Solution: Define it as an inline function. (ZyX)
-rw-r--r-- | src/macros.h | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/macros.h b/src/macros.h index b86c479e7..0f0a7d425 100644 --- a/src/macros.h +++ b/src/macros.h @@ -331,7 +331,7 @@ # if defined(WIN32) # ifndef isnan # define isnan(x) _isnan(x) -# define isinf(x) (!_finite(x) && !_isnan(x)) + static inline int isinf(double x) { return !_finite(x) && !_isnan(x); } # endif # else # ifndef HAVE_ISNAN diff --git a/src/version.c b/src/version.c index ace7ff14c..3623a099f 100644 --- a/src/version.c +++ b/src/version.c @@ -744,6 +744,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1487, +/**/ 1486, /**/ 1485, |