diff options
author | Bram Moolenaar <Bram@vim.org> | 2016-06-02 11:54:06 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2016-06-02 11:54:06 +0200 |
commit | cf190c6f017563de1bdbf854b3376522b8b2748f (patch) | |
tree | 330cc5a5cdb08d227bee6c48f117fb689339d499 | |
parent | b89a25f17e274dc308c584ea69a129ffbb26bc3d (diff) | |
download | vim-git-cf190c6f017563de1bdbf854b3376522b8b2748f.tar.gz |
patch 7.4.1869v7.4.1869
Problem: Can't build with old version of Perl.
Solution: Define PERLIO_FUNCS_DECL. (Tom G. Christensen)
-rw-r--r-- | src/if_perl.xs | 11 | ||||
-rw-r--r-- | src/version.c | 2 |
2 files changed, 13 insertions, 0 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs index a4899945f..83f14793c 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -61,6 +61,17 @@ # include <perliol.h> #endif +/* Workaround for perl < 5.8.7 */ +#ifndef PERLIO_FUNCS_DECL +# ifdef PERLIO_FUNCS_CONST +# define PERLIO_FUNCS_DECL(funcs) const PerlIO_funcs funcs +# define PERLIO_FUNCS_CAST(funcs) (PerlIO_funcs*)(funcs) +# else +# define PERLIO_FUNCS_DECL(funcs) PerlIO_funcs funcs +# define PERLIO_FUNCS_CAST(funcs) (funcs) +# endif +#endif + /* * Work around clashes between Perl and Vim namespace. proto.h doesn't * include if_perl.pro and perlsfio.pro when IN_PERL_FILE is defined, because diff --git a/src/version.c b/src/version.c index ea586106a..ed479cd36 100644 --- a/src/version.c +++ b/src/version.c @@ -754,6 +754,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1869, +/**/ 1868, /**/ 1867, |