diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-12-14 11:46:08 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-12-14 11:46:08 +0100 |
| commit | 7c0daf088e880e7cd4031c673876a2750323c79c (patch) | |
| tree | d7fda02d7e9c19d1dfd4405f8017cc2a9233de75 | |
| parent | 36c85b2c4639c06fd8e4398f1f7d29f5d4e0405f (diff) | |
| download | vim-git-7c0daf088e880e7cd4031c673876a2750323c79c.tar.gz | |
updated for version 7.4.127v7.4.127
Problem: Perl 5.18 on Unix doesn't work.
Solution: Move workaround to after including vim.h. (Ken Takata)
| -rw-r--r-- | src/if_perl.xs | 14 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 9 insertions, 7 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs index 650aeb2af..5a7514798 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -24,13 +24,6 @@ # define _USE_32BIT_TIME_T #endif -/* Work around for perl-5.18. - * Don't include "perl\lib\CORE\inline.h" for now, - * include it after Perl_sv_free2 is defined. */ -#ifdef DYNAMIC_PERL -# define PERL_NO_INLINE_FUNCTIONS -#endif - /* * Prevent including winsock.h. perl.h tries to detect whether winsock.h is * already included before including winsock2.h, because winsock2.h isn't @@ -44,6 +37,13 @@ #include "vim.h" +/* Work around for perl-5.18. + * Don't include "perl\lib\CORE\inline.h" for now, + * include it after Perl_sv_free2 is defined. */ +#ifdef DYNAMIC_PERL +# define PERL_NO_INLINE_FUNCTIONS +#endif + #include <EXTERN.h> #include <perl.h> #include <XSUB.h> diff --git a/src/version.c b/src/version.c index 277719528..936a79acf 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 */ /**/ + 127, +/**/ 126, /**/ 125, |