diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-06-15 16:47:35 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-06-15 16:47:35 +0200 |
| commit | 9be6e21575e52f5d22839f660f8ca1032097b2f5 (patch) | |
| tree | 2497a0469ea1735ba8962f48a715cc725ea13da2 /src | |
| parent | ff1806f8da8830ca2a528f2eaa39b3e85489da6d (diff) | |
| download | vim-9be6e21575e52f5d22839f660f8ca1032097b2f5.zip | |
updated for version 7.3.1198
Problem: Build error when using Perl 5.18.0 and dynamic loading.
Solution: Change #ifdefs for Perl_croak_xs_usage. (Ike Devolder)
Diffstat (limited to 'src')
| -rw-r--r-- | src/if_perl.xs | 10 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs index 9ac9907dd..118f60487 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -67,6 +67,10 @@ # define PERL5101_OR_LATER #endif +#if (PERL_REVISION == 5) && (PERL_VERSION >= 18) +# define PERL5180_OR_LATER +#endif + #ifndef pTHX # define pTHX void # define pTHX_ @@ -127,9 +131,11 @@ typedef int perl_key; # define perl_free dll_perl_free # define Perl_get_context dll_Perl_get_context # define Perl_croak dll_Perl_croak +# ifndef PERL5180_OR_LATER # ifdef PERL5101_OR_LATER # define Perl_croak_xs_usage dll_Perl_croak_xs_usage # endif +# endif # ifndef PROTO # define Perl_croak_nocontext dll_Perl_croak_nocontext # define Perl_call_argv dll_Perl_call_argv @@ -242,9 +248,11 @@ static int (*perl_run)(PerlInterpreter*); static int (*perl_parse)(PerlInterpreter*, XSINIT_t, int, char**, char**); static void* (*Perl_get_context)(void); static void (*Perl_croak)(pTHX_ const char*, ...); +#ifndef PERL5180_OR_LATER #ifdef PERL5101_OR_LATER static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params); #endif +#endif static void (*Perl_croak_nocontext)(const char*, ...); static I32 (*Perl_dowantarray)(pTHX); static void (*Perl_free_tmps)(pTHX); @@ -362,9 +370,11 @@ static struct { {"perl_parse", (PERL_PROC*)&perl_parse}, {"Perl_get_context", (PERL_PROC*)&Perl_get_context}, {"Perl_croak", (PERL_PROC*)&Perl_croak}, +#ifndef PERL5180_OR_LATER #ifdef PERL5101_OR_LATER {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage}, #endif +#endif {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext}, {"Perl_dowantarray", (PERL_PROC*)&Perl_dowantarray}, {"Perl_free_tmps", (PERL_PROC*)&Perl_free_tmps}, diff --git a/src/version.c b/src/version.c index ca687c7f1..8f4ddcf2a 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1198, +/**/ 1197, /**/ 1196, |