summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2011-10-12 14:11:45 +0200
committerBram Moolenaar <bram@vim.org>2011-10-12 14:11:45 +0200
commitcec7b511a686830880213e8a0084697d4a62feaa (patch)
tree7f4ca79134ae2351988299f4ae5f783e5e983972
parent49a073e9f3bb13c795f3a3d990120a67b7443864 (diff)
downloadvim-cec7b511a686830880213e8a0084697d4a62feaa.tar.gz
updated for version 7.3.334v7.3.334v7-3-334
Problem: Latest MingW about XSUBPP referencing itself. (Gongqian Li) Solution: Rename the first use to XSUBPPTRY.
-rw-r--r--src/Make_ming.mak6
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 3 deletions
diff --git a/src/Make_ming.mak b/src/Make_ming.mak
index 5867696a..bacdb04c 100644
--- a/src/Make_ming.mak
+++ b/src/Make_ming.mak
@@ -108,10 +108,10 @@ endif
# on NT, it's here:
PERLLIB=$(PERL)/lib
PERLLIBS=$(PERLLIB)/Core
-XSUBPP=$(PERLLIB)/ExtUtils/xsubpp
-XSUBPP_EXISTS=$(shell perl -e "print 1 unless -e '$(XSUBPP)'")
+XSUBPPTRY=$(PERLLIB)/ExtUtils/xsubpp
+XSUBPP_EXISTS=$(shell perl -e "print 1 unless -e '$(XSUBPPTRY)'")
ifeq "$(XSUBPP_EXISTS)" ""
-XSUBPP=perl $(XSUBPP)
+XSUBPP=perl $(XSUBPPTRY)
else
XSUBPP=xsubpp
endif
diff --git a/src/version.c b/src/version.c
index c9d6e24f..f63a9088 100644
--- a/src/version.c
+++ b/src/version.c
@@ -710,6 +710,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 334,
+/**/
333,
/**/
332,