summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-09-21 12:42:44 +0200
committerBram Moolenaar <Bram@vim.org>2012-09-21 12:42:44 +0200
commitf5fe79a5f38e0fef6077aa858b60989e94076910 (patch)
tree73f2b6b5d46d13c4acd29af1281b4d6be5e6b7d9
parent6f586de755cf0b814d0d8723fada8dd0bb58b94d (diff)
updated for version 7.3.667v7.3.667
Problem: Unused variables in Perl interface. Solution: Adjust #ifdefs.
-rw-r--r--.gitignore2
-rw-r--r--src/if_perl.xs10
-rw-r--r--src/version.c2
3 files changed, 11 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 37e032a5e2..d4af3a2f09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,8 +30,8 @@ src/auto/pathdef.c
*.suo
*.res
*.RES
+src/if_perl.c
src/pathdef.c
-src/perl.c
src/Obj*/pathdef.c
gvimext.dll
gvimext.lib
diff --git a/src/if_perl.xs b/src/if_perl.xs
index 4dc80beaa5..56e0eb3a1a 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -315,6 +315,9 @@ static STRLEN* (*Perl_Tna_ptr)(register PerlInterpreter*);
static void (*Perl_sv_free2)(pTHX_ SV*);
static void (*Perl_sys_init)(int* argc, char*** argv);
static void (*Perl_sys_term)(void);
+static void (*Perl_call_list)(pTHX_ I32, AV*);
+# if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
+# else
static SV** (*Perl_ISv_ptr)(register PerlInterpreter*);
static SV*** (*Perl_Istack_max_ptr)(register PerlInterpreter*);
static SV*** (*Perl_Istack_base_ptr)(register PerlInterpreter*);
@@ -326,16 +329,19 @@ static I32** (*Perl_Imarkstack_ptr_ptr)(register PerlInterpreter*);
static I32** (*Perl_Imarkstack_max_ptr)(register PerlInterpreter*);
static SV*** (*Perl_Istack_sp_ptr)(register PerlInterpreter*);
static OP** (*Perl_Iop_ptr)(register PerlInterpreter*);
-static void (*Perl_call_list)(pTHX_ I32, AV*);
static I32* (*Perl_Iscopestack_ix_ptr)(register PerlInterpreter*);
static AV** (*Perl_Iunitcheckav_ptr)(register PerlInterpreter*);
+# endif
#endif
+#if (PERL_REVISION == 5) && (PERL_VERSION >= 14)
+#else
static GV** (*Perl_Idefgv_ptr)(register PerlInterpreter*);
static GV** (*Perl_Ierrgv_ptr)(register PerlInterpreter*);
static SV* (*Perl_Isv_yes_ptr)(register PerlInterpreter*);
-static void (*boot_DynaLoader)_((pTHX_ CV*));
static perl_key* (*Perl_Gthr_key_ptr)_((pTHX));
+#endif
+static void (*boot_DynaLoader)_((pTHX_ CV*));
/*
* Table of name to function pointer of perl.
diff --git a/src/version.c b/src/version.c
index 95404c4519..4c93e3a398 100644
--- a/src/version.c
+++ b/src/version.c
@@ -720,6 +720,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 667,
+/**/
666,
/**/
665,