Mercurial > vim

changeset 2096:6510d834609f v7.2.380

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
updated for version 7.2.380 Problem: Perl interface builds with 5.10.1 but not with 5.10.0. Solution: Change the #ifdefs. (Sergey Khorev)
author Bram Moolenaar <bram@zimbu.org>
date Tue, 02 Mar 2010 15:14:33 +0100
parents 8aa3cd045aef
children 8f72e3512b43
files src/if_perl.xs src/version.c
diffstat 2 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- 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((pT
 # 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},
--- 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,