From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 11 Dec 2013 16:20:19 +0000 (+0100)
Subject: updated for version 7.4.120
X-Git-Tag: v7.4.120
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=fcf94d399015984742c4306c7e6676f07d7ed5fe;p=vim

updated for version 7.4.120
Problem:    Can't build with Perl 5.18 on Linux. (Lcd 47)
Solution:   Add #ifdef. (Ken Takata)
---

diff --git a/src/if_perl.xs b/src/if_perl.xs
index 009462721..650aeb2af 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -27,7 +27,9 @@
 /* Work around for perl-5.18.
  * Don't include "perl\lib\CORE\inline.h" for now,
  * include it after Perl_sv_free2 is defined. */
-#define PERL_NO_INLINE_FUNCTIONS
+#ifdef DYNAMIC_PERL
+# define PERL_NO_INLINE_FUNCTIONS
+#endif
 
 /*
  * Prevent including winsock.h.  perl.h tries to detect whether winsock.h is
diff --git a/src/version.c b/src/version.c
index b5f70193f..3d5edc0bc 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 */
+/**/
+    120,
 /**/
     119,
 /**/