Skip to content

Commit d79dbb3

Browse files
committed
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)
1 parent 7525e82 commit d79dbb3

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

src/Make_mvc.mak

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -825,7 +825,12 @@ PERL_INCDIR = $(PERL)\Lib$(PERL_ARCH)\Core
825825
PERL_LIB = $(PERL_INCDIR)\perl.lib
826826
!else
827827
PERL_DLL = perl$(PERL_VER).dll
828+
!if exist($(PERL_INCDIR)\perl$(PERL_VER).lib)
828829
PERL_LIB = $(PERL_INCDIR)\perl$(PERL_VER).lib
830+
!else
831+
# For ActivePerl 5.18 and later
832+
PERL_LIB = $(PERL_INCDIR)\libperl$(PERL_VER).a
833+
!endif
829834
!endif
830835

831836
CFLAGS = $(CFLAGS) -DFEAT_PERL

src/if_perl.xs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,11 @@
4444
# define PERL_NO_INLINE_FUNCTIONS
4545
#endif
4646

47+
/* Work around for using MSVC and ActivePerl 5.18. */
48+
#ifdef _MSC_VER
49+
# define __inline__ __inline
50+
#endif
51+
4752
#include <EXTERN.h>
4853
#include <perl.h>
4954
#include <XSUB.h>

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -738,6 +738,8 @@ static char *(features[]) =
738738

739739
static int included_patches[] =
740740
{ /* Add new patch number below this line */
741+
/**/
742+
128,
741743
/**/
742744
127,
743745
/**/

0 commit comments

Comments
 (0)