From: Bram Moolenaar Date: Sat, 14 Dec 2013 10:46:08 +0000 (+0100) Subject: updated for version 7.4.127 X-Git-Tag: v7.4.127 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7c0daf088e880e7cd4031c673876a2750323c79c;p=vim updated for version 7.4.127 Problem: Perl 5.18 on Unix doesn't work. Solution: Move workaround to after including vim.h. (Ken Takata) --- 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 #include #include diff --git a/src/version.c b/src/version.c index 277719528..936a79acf 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 */ +/**/ + 127, /**/ 126, /**/