summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2016-03-04 22:57:20 +0100
committerBram Moolenaar <Bram@vim.org>2016-03-04 22:57:20 +0100
commit0c171716c0430458741fbf18a6fd4baea4c0390b (patch)
tree783cd469436f0720ddc90633138cfa4ff8d83ccb
parent179f1b9a7ddf3624daf6380c3dad740e0a1ba361 (diff)
downloadvim-git-0c171716c0430458741fbf18a6fd4baea4c0390b.tar.gz
patch 7.4.1489v7.4.1489
Problem: "inline" is not supported by old MSVC. Solution: use "__inline". (Ken Takata)
-rw-r--r--src/macros.h2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/macros.h b/src/macros.h
index 0f0a7d425..7b7b17d1a 100644
--- a/src/macros.h
+++ b/src/macros.h
@@ -331,7 +331,7 @@
# if defined(WIN32)
# ifndef isnan
# define isnan(x) _isnan(x)
- static inline int isinf(double x) { return !_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 17fd8883c..64d17fc1c 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 */
/**/
+ 1489,
+/**/
1488,
/**/
1487,