updated for version 7.2.328

Problem:    has("win64") does not return 1 on 64 bit MS-Windows version.
Solution:   Also check for _WIN64 besides WIN64.

diff --git a/.gitignore b/.gitignore
index e989f5e3e94edcadfd02567e782ed70066b193b3..5243f92a0c064c90734fb65b474393deccaedf8f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# Unixen
+# Unixen: object and executable files.
 *.o
 src/vim
 src/xxd/xxd
@@ -16,7 +16,6 @@ src/auto/link.sed
 src/auto/pathdef.c
 
 # Windows
-.hgignore
 *.exe
 *.idb
 *.manifest

diff --git a/src/eval.c b/src/eval.c
index 6bd2aa72e5087e35cd2c02e89a7cc53e765f179f..c0765609480da10f12710dbb47f297aa3655505f 100644 (file)
--- a/src/eval.c
+++ b/src/eval.c
@@ -11453,7 +11453,7 @@ f_has(argvars, rettv)
 #if defined(UNIX) && (defined(__CYGWIN32__) || defined(__CYGWIN__))
        "win32unix",
 #endif
-#ifdef WIN64
+#if defined(WIN64) || defined(_WIN64)
        "win64",
 #endif
 #ifdef EBCDIC

diff --git a/src/version.c b/src/version.c
index a802841b36db0d973049a96239eeb245df234339..f628c8ca04f995ffb811c1c08690cd898074954a 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -681,6 +681,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    328,
 /**/
     327,
 /**/