patch 7.4.1011

Problem:    Can't build with Strawberry Perl.
Solution:   Include stdbool.h. (Ken Takata, closes #328)

diff --git a/Filelist b/Filelist
index e653fa130bd2cde96bc77c840bbf2122f520d53d..6170610b6b11f014870519b31a3ad5fc801c63cd 100644 (file)
--- 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
index 5583ef2d9686bea6728f7c7f618c63990a95b400..c5c0a1220ad4861eaaf69541bbf4316f1192fbd6 100644 (file)
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -826,6 +826,11 @@ CFLAGS = $(CFLAGS) -DDYNAMIC_PERL -DDYNAMIC_PERL_DLL=\"$(PERL_DLL)\"
 
 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 (file)
index 0000000..de89e3b
--- /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
index 59f9bc075e96db081ac4ca2497a68949f3621e3a..40237112794a16ea59e43c12292fda37f8445184 100644 (file)
--- a/src/version.c
+++ b/src/version.c
@@ -741,6 +741,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    1011,
 /**/
     1010,
 /**/