summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2012-04-20 16:13:25 +0200
committerBram Moolenaar <bram@vim.org>2012-04-20 16:13:25 +0200
commitb98b763dad51aad6fd64ab8a6c8681b8abe38245 (patch)
tree83b9537771ef8a07cc8962b85499ed354ea34154
parente63ad1819d6bd2efc095bf853f07b6064170df2e (diff)
downloadvim-b98b763dad51aad6fd64ab8a6c8681b8abe38245.tar.gz
updated for version 7.3.500v7.3.500v7-3-500
Problem: Ming makefile unconditionally sets WINVER. Solution: Only defined when not already defined. (Yasuhiro Matsumoto)
-rw-r--r--src/Make_ming.mak2
-rw-r--r--src/version.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index ca50d371..1392d87d 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -51,7 +51,9 @@ POSTSCRIPT=no
# set to yes to enable OLE support
OLE=no
# Set the default $(WINVER) to make it work with pre-Win2k
+ifndef WINVER
WINVER = 0x0400
+endif
# Set to yes to enable Cscope support
CSCOPE=yes
# Set to yes to enable Netbeans support
diff --git a/src/version.c b/src/version.c
index df3717ab..720e45a1 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 500,
+/**/
499,
/**/
498,