summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2014-06-12 16:03:28 +0200
committerBram Moolenaar <Bram@vim.org>2014-06-12 16:03:28 +0200
commit0e6c5ef7ef4f4a1eb16b5eebc97e3bf139d6276a (patch)
treef2e61cd12a41644e688ee8b825377c29667f840d
parent3be8585661f8b0a9b94e9bc1db6ebfa097c3270f (diff)
updated for version 7.4.321v7.4.321
Problem: Can't build with strawberry perl 5.20 + mingw-w64-4.9.0. Solution: Define save_strlen. (Ken Takata)
-rw-r--r--src/if_perl.xs9
-rw-r--r--src/version.c2
2 files changed, 11 insertions, 0 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs
index 590ef86ac0..286ceb7d71 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -191,6 +191,9 @@ typedef int perl_key;
# define Perl_pop_scope dll_Perl_pop_scope
# define Perl_push_scope dll_Perl_push_scope
# define Perl_save_int dll_Perl_save_int
+# if (PERL_REVISION == 5) && (PERL_VERSION >= 20)
+# define Perl_save_strlen dll_Perl_save_strlen
+# endif
# define Perl_stack_grow dll_Perl_stack_grow
# define Perl_set_context dll_Perl_set_context
# if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
@@ -311,6 +314,9 @@ static SV* (*Perl_call_method)(pTHX_ const char*, I32);
static void (*Perl_pop_scope)(pTHX);
static void (*Perl_push_scope)(pTHX);
static void (*Perl_save_int)(pTHX_ int*);
+#if (PERL_REVISION == 5) && (PERL_VERSION >= 20)
+static void (*Perl_save_strlen)(pTHX_ STRLEN* ptr);
+#endif
static SV** (*Perl_stack_grow)(pTHX_ SV**, SV**p, int);
static SV** (*Perl_set_context)(void*);
#if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
@@ -440,6 +446,9 @@ static struct {
{"Perl_pop_scope", (PERL_PROC*)&Perl_pop_scope},
{"Perl_push_scope", (PERL_PROC*)&Perl_push_scope},
{"Perl_save_int", (PERL_PROC*)&Perl_save_int},
+#if (PERL_REVISION == 5) && (PERL_VERSION >= 20)
+ {"Perl_save_strlen", (PERL_PROC*)&Perl_save_strlen},
+#endif
{"Perl_stack_grow", (PERL_PROC*)&Perl_stack_grow},
{"Perl_set_context", (PERL_PROC*)&Perl_set_context},
#if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
diff --git a/src/version.c b/src/version.c
index 0df080ea35..a876bf82e4 100644
--- a/src/version.c
+++ b/src/version.c
@@ -735,6 +735,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 321,
+/**/
320,
/**/
319,