summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2010-01-12 13:18:33 +0100
committerBram Moolenaar <Bram@vim.org>2010-01-12 13:18:33 +0100
commite37d79928d4f3a70fffad086241e65d21dd9e1c3 (patch)
tree624fadaa6657e79aca5fa13492bb364dbde419fd
parentef3c1a7fd7a755221f5f854b159ee515c922d4ed (diff)
downloadvim-git-e37d79928d4f3a70fffad086241e65d21dd9e1c3.tar.gz
updated for version 7.2.328v7.2.328
Problem: has("win64") does not return 1 on 64 bit MS-Windows version. Solution: Also check for _WIN64 besides WIN64.
-rw-r--r--.gitignore3
-rw-r--r--src/eval.c2
-rw-r--r--src/version.c2
3 files changed, 4 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index e989f5e3e..5243f92a0 100644
--- 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 6bd2aa72e..c07656094 100644
--- 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 a802841b3..f628c8ca0 100644
--- a/src/version.c
+++ b/src/version.c
@@ -682,6 +682,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 328,
+/**/
327,
/**/
326,