From: Dave Mitchell <davem@fdisolutions.com>
Date: Mon, 1 Mar 2004 22:00:11 +0000 (+0000)
Subject: integrate Time::HiRes 1.56 from CPAN
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=1caec985a4c002b6acd7aaed08ebf5b117752c94;p=p5sagit%2Fp5-mst-13.2.git

integrate Time::HiRes 1.56 from CPAN
(which is itself mostly derived from the bleedperl version)

p4raw-id: //depot/perl@22418
---

diff --git a/ext/Time/HiRes/Changes b/ext/Time/HiRes/Changes
index 2e4a383..7db2cf3 100644
--- a/ext/Time/HiRes/Changes
+++ b/ext/Time/HiRes/Changes
@@ -1,5 +1,10 @@
 Revision history for Perl extension Time::HiRes.
 
+1.56
+	- Give a clearer message if the tests timeout (perl change #22253)
+	- Don't use /tmp or its moral equivalents (perl bug #15036,
+	  perl change #22258)
+
 1.55
 	- Windows: ming32 patch from Mike Pomraning (use Perl's Const64()
 	  instead of VC-specific i64 suffix)
diff --git a/ext/Time/HiRes/HiRes.pm b/ext/Time/HiRes/HiRes.pm
index c958e84..574dfd4 100644
--- a/ext/Time/HiRes/HiRes.pm
+++ b/ext/Time/HiRes/HiRes.pm
@@ -15,7 +15,7 @@ require DynaLoader;
 		 d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer
 		 d_nanosleep);
 	
-$VERSION = '1.55_01';
+$VERSION = '1.56';
 $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
diff --git a/ext/Time/HiRes/Makefile.PL b/ext/Time/HiRes/Makefile.PL
index 75dff90..c48339c 100644
--- a/ext/Time/HiRes/Makefile.PL
+++ b/ext/Time/HiRes/Makefile.PL
@@ -380,7 +380,7 @@ sub doMakefile {
 	    'SUFFIX'   => 'gz',
 	},
         clean => { FILES => "xdefine" },
-        realclean => {FILES=> 'const-c.inc const-xs.inc'},
+        realclean => { FILES=> 'const-c.inc const-xs.inc' },
     );
 
     if ($ENV{PERL_CORE}) {
@@ -445,7 +445,8 @@ EOM
             print  <<EOM;
 NOTE: if you get an error like this (the line number may vary):
 Makefile:91: *** missing separator
-then set the environment variable LC_ALL to "C" and retry.
+then set the environment variable LC_ALL to "C" and retry
+from scratch (re-run perl "Makefile.PL").
 
 EOM
         }