Mercurial > vim
changeset 4905:517fa1a34c7c v7.3.1198
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)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Sat, 15 Jun 2013 16:47:35 +0200 |
| parents | a412fe715ffd |
| children | c8f3c963f8fc |
| files | src/if_perl.xs src/version.c |
| diffstat | 2 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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},