summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <bram@vim.org>2013-12-11 17:20:19 +0100
committerBram Moolenaar <bram@vim.org>2013-12-11 17:20:19 +0100
commit7181358d58f1223c29f0314f7dbe67588a6c9f19 (patch)
treec444cd32d5c5bec6142528ab4598e8ed6e0f6269
parent07e4ee3f976883b0a7cd07226ad150eb08f40ed1 (diff)
downloadvim-7181358d58f1223c29f0314f7dbe67588a6c9f19.tar.gz
updated for version 7.4.120v7.4.120v7-4-120
Problem: Can't build with Perl 5.18 on Linux. (Lcd 47) Solution: Add #ifdef. (Ken Takata)
-rw-r--r--src/if_perl.xs4
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs
index 00946272..650aeb2a 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 b5f70193..3d5edc0b 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 */
/**/
+ 120,
+/**/
119,
/**/
118,