Change 18563 by jhi@kosh on 2003/01/22 18:03:40
Integrate:
[ 18541]
Try to make including patchlevel.h a bit more
robust (use <> instead of "") and in case of
failure (PERL_VERSION didn't get defined) try
to fail (by trying to #include an "obviously"
named file that should not exist) (didn't use
#error since IIRC older cpps do not have it)
(Tries to address [perl #20276].)
[ 18543]
Update the MD5 checksums.
Affected files ...
... //depot/maint-5.8/perl/ext/Data/Dumper/Dumper.xs#3 integrate
... //depot/maint-5.8/perl/ext/Devel/PPPort/PPPort.pm#3 integrate
... //depot/maint-5.8/perl/ext/Digest/MD5/MD5.xs#3 integrate
... //depot/maint-5.8/perl/ext/Digest/MD5/t/files.t#4 integrate
... //depot/maint-5.8/perl/ext/List/Util/Util.xs#4 integrate
... //depot/maint-5.8/perl/ext/Storable/Storable.xs#5 integrate
Differences ...
==== //depot/maint-5.8/perl/ext/Data/Dumper/Dumper.xs#3 (text) ====
Index: perl/ext/Data/Dumper/Dumper.xs
--- perl/ext/Data/Dumper/Dumper.xs#2~18448~ Sun Jan 5 07:29:54 2003
+++ perl/ext/Data/Dumper/Dumper.xs Wed Jan 22 10:03:40 2003
@@ -4,8 +4,11 @@
#include "XSUB.h"
#ifndef PERL_VERSION
-#include "patchlevel.h"
-#define PERL_VERSION PATCHLEVEL
+# include <patchlevel.h>
+# ifndef PERL_VERSION
+# include <could_not_find_Perl_patchlevel.h>
+# endif
+# define PERL_VERSION PATCHLEVEL
#endif
#if PERL_VERSION < 5
==== //depot/maint-5.8/perl/ext/Devel/PPPort/PPPort.pm#3 (text) ====
Index: perl/ext/Devel/PPPort/PPPort.pm
--- perl/ext/Devel/PPPort/PPPort.pm#2~18080~ Sun Nov 3 21:23:04 2002
+++ perl/ext/Devel/PPPort/PPPort.pm Wed Jan 22 10:03:40 2003
@@ -355,7 +355,10 @@
#ifndef PERL_REVISION
# ifndef __PATCHLEVEL_H_INCLUDED__
-# include "patchlevel.h"
+# include <patchlevel.h>
+# endif
+# ifndef PERL_VERSION
+# include <could_not_find_Perl_patchlevel.h>
# endif
# ifndef PERL_REVISION
# define PERL_REVISION (5)
==== //depot/maint-5.8/perl/ext/Digest/MD5/MD5.xs#3 (text) ====
Index: perl/ext/Digest/MD5/MD5.xs
--- perl/ext/Digest/MD5/MD5.xs#2~18515~ Sat Jan 18 10:43:52 2003
+++ perl/ext/Digest/MD5/MD5.xs Wed Jan 22 10:03:40 2003
@@ -44,7 +44,10 @@
}
#endif
-#include "patchlevel.h"
+#include <patchlevel.h>
+#ifndef PERL_VERSION
+# include <could_not_find_Perl_patchlevel.h>
+#endif
#if PATCHLEVEL <= 4 && !defined(PL_dowarn)
#define PL_dowarn dowarn
#endif
==== //depot/maint-5.8/perl/ext/Digest/MD5/t/files.t#4 (text) ====
Index: perl/ext/Digest/MD5/t/files.t
--- perl/ext/Digest/MD5/t/files.t#3~18515~ Sat Jan 18 10:43:52 2003
+++ perl/ext/Digest/MD5/t/files.t Wed Jan 22 10:03:40 2003
@@ -23,7 +23,7 @@
ed8efe2e2dbab62fcc9dea2df6682569 Changes
0565ec21b15c0f23f4c51fb327c8926d README
0fcdd6d6e33b8772bd4b4832043035cd MD5.pm
-d7fd24455b9160aa8706635d15e6177e MD5.xs
+4757a101ad5df97136a2fa8e910d9d6a MD5.xs
276da0aa4e9a08b7fe09430c9c5690aa rfc1321.txt
EOT
} elsif ("\n" eq "\015") { # MacOS
@@ -31,7 +31,7 @@
2879619f967d5fc5a00ffe37b639f2ee Changes
6c950a0211a5a28f023bb482037698cd README
4e1043f0a7a266416d8408d6fa96f454 MD5.pm
-6bff95ff70ba43a6c81e255c6510a865 MD5.xs
+fc1b8007a6f5262561a0a76493759a55 MD5.xs
754b9db19f79dbc4992f7166eb0f37ce rfc1321.txt
EOT
} else {
@@ -40,7 +40,7 @@
2879619f967d5fc5a00ffe37b639f2ee Changes
6c950a0211a5a28f023bb482037698cd README
4e1043f0a7a266416d8408d6fa96f454 MD5.pm
-6bff95ff70ba43a6c81e255c6510a865 MD5.xs
+fc1b8007a6f5262561a0a76493759a55 MD5.xs
754b9db19f79dbc4992f7166eb0f37ce rfc1321.txt
EOT
}
==== //depot/maint-5.8/perl/ext/List/Util/Util.xs#4 (text) ====
Index: perl/ext/List/Util/Util.xs
--- perl/ext/List/Util/Util.xs#3~18296~ Thu Dec 12 10:21:12 2002
+++ perl/ext/List/Util/Util.xs Wed Jan 22 10:03:40 2003
@@ -8,7 +8,10 @@
#include <XSUB.h>
#ifndef PERL_VERSION
-# include "patchlevel.h"
+# include <patchlevel.h>
+# ifndef PERL_VERSION
+# include <could_not_find_Perl_patchlevel.h>
+# endif
# define PERL_REVISION 5
# define PERL_VERSION PATCHLEVEL
# define PERL_SUBVERSION SUBVERSION
==== //depot/maint-5.8/perl/ext/Storable/Storable.xs#5 (text) ====
Index: perl/ext/Storable/Storable.xs
--- perl/ext/Storable/Storable.xs#4~18197~ Wed Nov 27 20:14:27 2002
+++ perl/ext/Storable/Storable.xs Wed Jan 22 10:03:40 2003
@@ -11,6 +11,9 @@
#include <EXTERN.h>
#include <perl.h>
#include <patchlevel.h> /* Perl's one, needed since 5.6 */
+#ifndef PERL_VERSION
+# include <could_not_find_Perl_patchlevel.h>
+#endif
#include <XSUB.h>
#ifndef NETWARE
End of Patch.
