thac0/vim
1
0
Fork 0
forked from aniani/vim
Code Activity

updated for version 7.4.128

Browse Source 
Problem:    Perl 5.18 for MSVC doesn't work.
Solution:   Add check in makefile and define __inline. (Ken Takata)
This commit is contained in:
Bram Moolenaar
2013-12-14 11:50:35 +01:00
parent 7c0daf088e
commit 207fd75cac
3 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Make_mvc.mak
View File

@@ -825,7 +825,12 @@ PERL_INCDIR = $(PERL)\Lib$(PERL_ARCH)\Core
PERL_LIB = $(PERL_INCDIR)\perl.lib PERL_LIB = $(PERL_INCDIR)\perl.lib
!else !else
PERL_DLL = perl$(PERL_VER).dll PERL_DLL = perl$(PERL_VER).dll
!if exist($(PERL_INCDIR)\perl$(PERL_VER).lib)
PERL_LIB = $(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 !endif
CFLAGS = $(CFLAGS) -DFEAT_PERL CFLAGS = $(CFLAGS) -DFEAT_PERL

5
src/if_perl.xs
View File

@@ -44,6 +44,11 @@
# define PERL_NO_INLINE_FUNCTIONS # define PERL_NO_INLINE_FUNCTIONS
#endif #endif
/* Work around for using MSVC and ActivePerl 5.18. */
#ifdef _MSC_VER
# define __inline__ __inline
#endif
#include <EXTERN.h> #include <EXTERN.h>
#include <perl.h> #include <perl.h>
#include <XSUB.h> #include <XSUB.h>

2
src/version.c
View File

@@ -738,6 +738,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 */
/**/
128,
/**/ /**/
127, 127,
/**/ /**/