diff options
| author | Bram Moolenaar <bram@vim.org> | 2013-12-14 11:50:35 +0100 |
|---|---|---|
| committer | Bram Moolenaar <bram@vim.org> | 2013-12-14 11:50:35 +0100 |
| commit | 12829f69ce0569488426b31cfcd0553dd9f444ca (patch) | |
| tree | 46875d21a46bd3cc37e4c57f8fe9d8adf8c45fa2 | |
| parent | 94c01671f8165a3860c9395af2e43e876b2242e8 (diff) | |
| download | vim-12829f69ce0569488426b31cfcd0553dd9f444ca.tar.gz | |
Problem: Perl 5.18 for MSVC doesn't work.
Solution: Add check in makefile and define __inline. (Ken Takata)
| -rw-r--r-- | src/Make_mvc.mak | 5 | ||||
| -rw-r--r-- | src/if_perl.xs | 5 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 12 insertions, 0 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 5a07cd09..6718e141 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 5a751479..57a3b8fd 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 <EXTERN.h> #include <perl.h> #include <XSUB.h> diff --git a/src/version.c b/src/version.c index 936a79ac..82ccc55d 100644 --- a/src/version.c +++ b/src/version.c @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 128, +/**/ 127, /**/ 126, |