# HG changeset patch # User Christian Brabandt # Date 1451592004 -3600 # Node ID d467ca80d3c1b542772127a187cf3c4909bb7cb2 # Parent e4a99bffa1ab96a7f6c09ab7a8f2a746b9a9dd33 commit https://github.com/vim/vim/commit/2bf2417612879de627dcea1dbb22ee2199b16963 Author: Bram Moolenaar 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) diff --git a/Filelist b/Filelist --- 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 \ diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak --- 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)) diff --git a/src/if_perl_msvc/stdbool.h b/src/if_perl_msvc/stdbool.h 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 diff --git a/src/version.c b/src/version.c --- 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,