diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-12-11 17:20:19 +0100 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-12-11 17:20:19 +0100 |
commit | fcf94d399015984742c4306c7e6676f07d7ed5fe (patch) | |
tree | 679c42b157d273d6aba5e492d4c371cea628c230 | |
parent | 4ffa07081f97db6b49d6d087ce46ff0b3a4c8a5c (diff) | |
download | vim-git-fcf94d399015984742c4306c7e6676f07d7ed5fe.tar.gz |
updated for version 7.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.xs | 4 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 5 insertions, 1 deletions
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 @@ -739,6 +739,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 120, +/**/ 119, /**/ 118, |