forked from aniani/vim
patch 7.4.1011
Problem: Can't build with Strawberry Perl. Solution: Include stdbool.h. (Ken Takata, closes #328)
This commit is contained in:
1
Filelist
1
Filelist
@@ -315,6 +315,7 @@ SRC_DOS = \
|
|||||||
src/if_ole.cpp \
|
src/if_ole.cpp \
|
||||||
src/if_ole.h \
|
src/if_ole.h \
|
||||||
src/if_ole.idl \
|
src/if_ole.idl \
|
||||||
|
src/if_perl_msvc/stdbool.h \
|
||||||
src/iid_ole.c \
|
src/iid_ole.c \
|
||||||
src/os_dos.h \
|
src/os_dos.h \
|
||||||
src/os_msdos.c \
|
src/os_msdos.c \
|
||||||
|
@@ -826,6 +826,11 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"$(PERL_DLL)\"
|
|||||||
|
|
||||||
PERL_EXE = $(PERL)\Bin$(PERL_ARCH)\perl
|
PERL_EXE = $(PERL)\Bin$(PERL_ARCH)\perl
|
||||||
PERL_INC = /I $(PERL_INCDIR)
|
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
|
PERL_OBJ = $(OUTDIR)\if_perl.obj $(OUTDIR)\if_perlsfio.obj
|
||||||
XSUBPP = $(PERL)\lib\ExtUtils\xsubpp
|
XSUBPP = $(PERL)\lib\ExtUtils\xsubpp
|
||||||
!if exist($(XSUBPP))
|
!if exist($(XSUBPP))
|
||||||
|
3
src/if_perl_msvc/stdbool.h
Normal file
3
src/if_perl_msvc/stdbool.h
Normal file
@@ -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
|
@@ -741,6 +741,8 @@ static char *(features[]) =
|
|||||||
|
|
||||||
static int included_patches[] =
|
static int included_patches[] =
|
||||||
{ /* Add new patch number below this line */
|
{ /* Add new patch number below this line */
|
||||||
|
/**/
|
||||||
|
1011,
|
||||||
/**/
|
/**/
|
||||||
1010,
|
1010,
|
||||||
/**/
|
/**/
|
||||||
|
Reference in New Issue
Block a user