Mercurial > vim

changeset 7414:d467ca80d3c1 v7.4.1011

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
commit https://github.com/vim/vim/commit/2bf2417612879de627dcea1dbb22ee2199b16963 Author: Bram Moolenaar <Bram@vim.org> Date: Thu Dec 31 20:54:51 2015 +0100 patch 7.4.1011 Problem: Can't build with Strawberry Perl. Solution: Include stdbool.h. (Ken Takata, closes https://github.com/vim/vim/issues/328)
author Christian Brabandt <cb@256bit.org>
date Thu, 31 Dec 2015 21:00:04 +0100
parents e4a99bffa1ab
children 28341f2656d1
files Filelist src/Make_mvc.mak src/if_perl_msvc/stdbool.h src/version.c
diffstat 4 files changed, 11 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/Filelist
+++ b/Filelist
@@ -315,6 +315,7 @@ SRC_DOS =	\
 		src/if_ole.cpp \
 		src/if_ole.h \
 		src/if_ole.idl \
+		src/if_perl_msvc/stdbool.h \
 		src/iid_ole.c \
 		src/os_dos.h \
 		src/os_msdos.c \
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -826,6 +826,11 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_PERL -DDYNA
 
 PERL_EXE = $(PERL)\Bin$(PERL_ARCH)\perl
 PERL_INC = /I $(PERL_INCDIR)
+!if $(MSVC_MAJOR) <= 11
+# ActivePerl 5.20+ requires stdbool.h but VC2012 or earlier doesn't have it.
+# Use a stub stdbool.h.
+PERL_INC = $(PERL_INC) /I if_perl_msvc
+!endif
 PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj
 XSUBPP = $(PERL)\lib\ExtUtils\xsubpp
 !if exist($(XSUBPP))
new file mode 100644
--- /dev/null
+++ b/src/if_perl_msvc/stdbool.h
@@ -0,0 +1,3 @@
+/* A stub stdbool.h for VC2012 or earlier.
+ * ActivePerl 5.20+ requires stdbool.h but VC2012 doesn't have it. */
+#define bool char
--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1011,
+/**/
     1010,
 /**/
     1009,