summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2007-09-15 12:49:35 +0000
committerBram Moolenaar <Bram@vim.org>2007-09-15 12:49:35 +0000
commit3b9b13e5647617b96f878ed302f67ad87838c8d5 (patch)
tree4d2ed61c2c5f317a6798b226e26ed049aa7323c1
parent073545473f4b40c45b84f699a6abfc29119adede (diff)
downloadvim-git-3b9b13e5647617b96f878ed302f67ad87838c8d5.tar.gz
updated for version 7.1-110v7.1.110
-rw-r--r--src/if_perl.xs14
-rw-r--r--src/version.c2
2 files changed, 10 insertions, 6 deletions
diff --git a/src/if_perl.xs b/src/if_perl.xs
index ca8f1a83d..2e27fed24 100644
--- a/src/if_perl.xs
+++ b/src/if_perl.xs
@@ -48,13 +48,15 @@
* The changes include addition of two symbols (Perl_sv_2iv_flags,
* Perl_newXS_flags) not present in earlier releases.
*
- * Jan Dubois suggested the following guarding scheme:
+ * Jan Dubois suggested the following guarding scheme.
+ *
+ * Active State defined ACTIVEPERL_VERSION as a string in versions before
+ * 5.8.8; and so the comparison to 822 below needs to be guarded.
*/
-#if (ACTIVEPERL_VERSION >= 822)
-# define PERL589_OR_LATER
-#endif
-#if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 9)
-# define PERL589_OR_LATER
+#if (PERL_REVISION == 5) && (PERL_VERSION == 8) && (PERL_SUBVERSION >= 8)
+# if (ACTIVEPERL_VERSION >= 822) || (PERL_SUBVERSION >= 9)
+# define PERL589_OR_LATER
+# endif
#endif
#if (PERL_REVISION == 5) && (PERL_VERSION >= 9)
# define PERL589_OR_LATER
diff --git a/src/version.c b/src/version.c
index 300bd3eef..d4757007e 100644
--- a/src/version.c
+++ b/src/version.c
@@ -667,6 +667,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 110,
+/**/
109,
/**/
108,