[patch] rid local_patches warnings

Message-ID: <Pine.LNX.4.21.0106121024470.24181-100000@mako.covalent.net>

p4raw-id: //depot/perl@10548

diff --git a/ext/List/Util/Util.xs b/ext/List/Util/Util.xs
index 024f875..f75944d 100644 (file)
--- a/ext/List/Util/Util.xs
+++ b/ext/List/Util/Util.xs
@@ -6,9 +6,15 @@
 #include <EXTERN.h>
 #include <perl.h>
 #include <XSUB.h>
-#include <patchlevel.h>
 
-#if PATCHLEVEL < 5
+#ifndef PERL_VERSION
+#    include "patchlevel.h"
+#    define PERL_REVISION      5
+#    define PERL_VERSION       PATCHLEVEL
+#    define PERL_SUBVERSION    SUBVERSION
+#endif
+
+#if PERL_VERSION < 5
 #  ifndef gv_stashpvn
 #    define gv_stashpvn(n,l,c) gv_stashpv(n,c)
 #  endif
@@ -36,7 +42,7 @@ sv_tainted(SV *sv)
 #  define PL_sv_undef sv_undef
 #  define PERL_CONTEXT struct context
 #endif
-#if (PATCHLEVEL < 5) || (PATCHLEVEL == 5 && SUBVERSION <50)
+#if (PERL_VERSION < 5) || (PERL_VERSION == 5 && PERL_SUBVERSION <50)
 #  ifndef PL_tainting
 #    define PL_tainting tainting
 #  endif

diff --git a/ext/Storable/Storable.xs b/ext/Storable/Storable.xs
index 4e2db19..6663998 100644 (file)
--- a/ext/Storable/Storable.xs
+++ b/ext/Storable/Storable.xs
@@ -47,7 +47,6 @@
 
 #include <EXTERN.h>
 #include <perl.h>
-#include <patchlevel.h>                /* Perl's one, needed since 5.6 */
 #include <XSUB.h>
 
 #if 0
@@ -75,6 +74,7 @@
  */
 
 #ifndef PERL_VERSION           /* For perls < 5.6 */
+#include <patchlevel.h>
 #define PERL_VERSION PATCHLEVEL
 #ifndef newRV_noinc
 #define newRV_noinc(sv)                ((Sv = newRV(sv)), --SvREFCNT(SvRV(Sv)), Sv)