Mercurial > vim

changeset 5558:6f5a7d394300 v7.4.127

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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)
author Bram Moolenaar <bram@vim.org>
date Sat, 14 Dec 2013 11:46:08 +0100
parents 3eb577298089
children 4e448701bb52
files src/if_perl.xs src/version.c
diffstat 2 files changed, 9 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- 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>
--- 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,