summaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorJarkko Hietaniemi <jhi@iki.fi>2003-02-15 08:16:26 +0000
committerJarkko Hietaniemi <jhi@iki.fi>2003-02-15 08:16:26 +0000
commita3bf621f36e93c14b1d9e7c57c2ce75d1a8b29d4 (patch)
tree5ee0fa1589fbd9f34ba3d22e63585b40e2f09336 /ext
parent3b0d546b549c81b8fd7281af083002e289e306d6 (diff)
downloadperl-a3bf621f36e93c14b1d9e7c57c2ce75d1a8b29d4.tar.gz
Make the patchlevel.h inclusion attempt pre-5.6.0-safe(r)
(problem noticed by Graham with List::Util). p4raw-id: //depot/perl@18709
Diffstat (limited to 'ext')
-rw-r--r--ext/Data/Dumper/Dumper.xs2
-rw-r--r--ext/Digest/MD5/MD5.xs9
-rw-r--r--ext/MIME/Base64/Base64.xs8
-rw-r--r--ext/Storable/Storable.xs9
4 files changed, 20 insertions, 8 deletions
diff --git a/ext/Data/Dumper/Dumper.xs b/ext/Data/Dumper/Dumper.xs
index 00b52dfa00..c0ab07c508 100644
--- a/ext/Data/Dumper/Dumper.xs
+++ b/ext/Data/Dumper/Dumper.xs
@@ -5,7 +5,7 @@
#ifndef PERL_VERSION
# include <patchlevel.h>
-# ifndef PERL_VERSION
+# if !(defined(PERL_VERSION) || (SUBVERSION > 0 && defined(PATCHLEVEL)))
# include <could_not_find_Perl_patchlevel.h>
# endif
# define PERL_VERSION PATCHLEVEL
diff --git a/ext/Digest/MD5/MD5.xs b/ext/Digest/MD5/MD5.xs
index b1f2a04cdf..f70acbb8fa 100644
--- a/ext/Digest/MD5/MD5.xs
+++ b/ext/Digest/MD5/MD5.xs
@@ -44,10 +44,13 @@ extern "C" {
}
#endif
-#include <patchlevel.h>
-#ifndef PERL_VERSION
-# include <could_not_find_Perl_patchlevel.h>
+#ifndef PATCHLEVEL
+# include <patchlevel.h>
+# if !(defined(PERL_VERSION) || (SUBVERSION > 0 && defined(PATCHLEVEL)))
+# include <could_not_find_Perl_patchlevel.h>
+# endif
#endif
+
#if PATCHLEVEL <= 4 && !defined(PL_dowarn)
#define PL_dowarn dowarn
#endif
diff --git a/ext/MIME/Base64/Base64.xs b/ext/MIME/Base64/Base64.xs
index da2da500fc..6f855fb92a 100644
--- a/ext/MIME/Base64/Base64.xs
+++ b/ext/MIME/Base64/Base64.xs
@@ -35,7 +35,13 @@ extern "C" {
}
#endif
-#include "patchlevel.h"
+#ifndef PATCHLEVEL
+# include <patchlevel.h>
+# if !(defined(PERL_VERSION) || (SUBVERSION > 0 && defined(PATCHLEVEL)))
+# include <could_not_find_Perl_patchlevel.h>
+# endif
+#endif
+
#if PATCHLEVEL <= 4 && !defined(PL_dowarn)
#define PL_dowarn dowarn
#endif
diff --git a/ext/Storable/Storable.xs b/ext/Storable/Storable.xs
index 7cc610e733..4073f928c2 100644
--- a/ext/Storable/Storable.xs
+++ b/ext/Storable/Storable.xs
@@ -10,11 +10,14 @@
#include <EXTERN.h>
#include <perl.h>
-#include <patchlevel.h> /* Perl's one, needed since 5.6 */
+#include <XSUB.h>
+
#ifndef PERL_VERSION
-# include <could_not_find_Perl_patchlevel.h>
+# include <patchlevel.h> /* Perl's one, needed since 5.6 */
+# if !(defined(PERL_VERSION) || (SUBVERSION > 0 && defined(PATCHLEVEL)))
+# include <could_not_find_Perl_patchlevel.h>
+# endif
#endif
-#include <XSUB.h>
#ifndef NETWARE
#if 0