summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2019-02-18 22:14:18 +0100
committerBram Moolenaar <Bram@vim.org>2019-02-18 22:14:18 +0100
commit44b443c5db7a372b2da519be15dd962c552e1355 (patch)
tree8a7f0089dac9d42a3f911b7940cfc23c0d801e32
parent14816ad6e58336773443f5ee2e4aa9e384af65d2 (diff)
patch 8.1.0951: using WIN64 even though it is never definedv8.1.0951
Problem: Using WIN64 even though it is never defined. Solution: Only use _WIN64. (Ken Takata, closes #3997)
-rw-r--r--src/evalfunc.c2
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/evalfunc.c b/src/evalfunc.c
index e94d875da9..7f50555fc2 100644
--- a/src/evalfunc.c
+++ b/src/evalfunc.c
@@ -6158,7 +6158,7 @@ f_has(typval_T *argvars, typval_T *rettv)
#if defined(UNIX) && (defined(__CYGWIN32__) || defined(__CYGWIN__))
"win32unix",
#endif
-#if defined(WIN64) || defined(_WIN64)
+#ifdef _WIN64
"win64",
#endif
#ifdef EBCDIC
diff --git a/src/version.c b/src/version.c
index fe498ecf51..ee34042331 100644
--- a/src/version.c
+++ b/src/version.c
@@ -780,6 +780,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 951,
+/**/
950,
/**/
949,