From 207fd75cac7bc658da039f551620d51c422def44 Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sat, 14 Dec 2013 11:50:35 +0100 Subject: [PATCH] updated for version 7.4.128 Problem: Perl 5.18 for MSVC doesn't work. Solution: Add check in makefile and define __inline. (Ken Takata) --- src/Make_mvc.mak | 5 +++++ src/if_perl.xs | 5 +++++ src/version.c | 2 ++ 3 files changed, 12 insertions(+) diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 5a07cd095..6718e141a 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -825,7 +825,12 @@ PERL_INCDIR = $(PERL)\Lib$(PERL_ARCH)\Core PERL_LIB = $(PERL_INCDIR)\perl.lib !else PERL_DLL = perl$(PERL_VER).dll +!if exist($(PERL_INCDIR)\perl$(PERL_VER).lib) PERL_LIB = $(PERL_INCDIR)\perl$(PERL_VER).lib +!else +# For ActivePerl 5.18 and later +PERL_LIB = $(PERL_INCDIR)\libperl$(PERL_VER).a +!endif !endif CFLAGS = $(CFLAGS) -DFEAT_PERL diff --git a/src/if_perl.xs b/src/if_perl.xs index 5a7514798..57a3b8fd1 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -44,6 +44,11 @@ # define PERL_NO_INLINE_FUNCTIONS #endif +/* Work around for using MSVC and ActivePerl 5.18. */ +#ifdef _MSC_VER +# define __inline__ __inline +#endif + #include #include #include diff --git a/src/version.c b/src/version.c index 936a79acf..82ccc55d4 100644 --- a/src/version.c +++ b/src/version.c @@ -738,6 +738,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 128, /**/ 127, /**/ -- 2.40.0