diff options
| author | Bram Moolenaar <Bram@vim.org> | 2010-03-02 15:14:33 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2010-03-02 15:14:33 +0100 |
| commit | 58cb0898a379bee5989019a6a3362032b5708408 (patch) | |
| tree | e55731122fbc934aa0453de22253a7958f3f66e1 /src | |
| parent | 8cac9fd020f2c4b70856939b098a00546f2009ce (diff) | |
| download | vim-git-58cb0898a379bee5989019a6a3362032b5708408.tar.gz | |
updated for version 7.2.380v7.2.380
Problem: Perl interface builds with 5.10.1 but not with 5.10.0.
Solution: Change the #ifdefs. (Sergey Khorev)
Diffstat (limited to 'src')
| -rw-r--r-- | src/if_perl.xs | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 10 insertions, 3 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs index 978470795..5c0c8ead6 100644 --- a/src/if_perl.xs +++ b/src/if_perl.xs @@ -62,6 +62,11 @@ # define PERL589_OR_LATER #endif +#if (PERL_REVISION == 5) && ((PERL_VERSION > 10) || \ + (PERL_VERSION == 10) && (PERL_SUBVERSION >= 1)) +# define PERL5101_OR_LATER +#endif + #ifndef pTHX # define pTHX void # define pTHX_ @@ -93,7 +98,7 @@ EXTERN_C void boot_DynaLoader __ARGS((pTHX_ CV*)); # define perl_free dll_perl_free # define Perl_get_context dll_Perl_get_context # define Perl_croak dll_Perl_croak -# if (PERL_REVISION == 5) && (PERL_VERSION >= 10) +# ifdef PERL5101_OR_LATER # define Perl_croak_xs_usage dll_Perl_croak_xs_usage # endif # ifndef PROTO @@ -205,7 +210,7 @@ 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*, ...); -#if (PERL_REVISION == 5) && (PERL_VERSION >= 10) +#ifdef PERL5101_OR_LATER static void (*Perl_croak_xs_usage)(pTHX_ const CV *const, const char *const params); #endif static void (*Perl_croak_nocontext)(const char*, ...); @@ -312,7 +317,7 @@ static struct { {"perl_parse", (PERL_PROC*)&perl_parse}, {"Perl_get_context", (PERL_PROC*)&Perl_get_context}, {"Perl_croak", (PERL_PROC*)&Perl_croak}, -#if (PERL_REVISION == 5) && (PERL_VERSION >= 10) +#ifdef PERL5101_OR_LATER {"Perl_croak_xs_usage", (PERL_PROC*)&Perl_croak_xs_usage}, #endif {"Perl_croak_nocontext", (PERL_PROC*)&Perl_croak_nocontext}, diff --git a/src/version.c b/src/version.c index 89b94d627..ae1731cd0 100644 --- a/src/version.c +++ b/src/version.c @@ -682,6 +682,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 380, +/**/ 379, /**/ 378, |