Upgrade to Time-HiRes-1.80

p4raw-id: //depot/perl@25985

3 files changed, 12 insertions, 8 deletions

diff --git a/ext/Time/HiRes/Changes b/ext/Time/HiRes/Changes
index 58e5be4a52..91abfe42d2 100644
--- a/ext/Time/HiRes/Changes
+++ b/ext/Time/HiRes/Changes
@@ -1,5 +1,8 @@
 Revision history for Perl extension Time::HiRes.
 
+1.80	[2005-10-04]
+	- Gisle noticed a mistake (using HAS_NANOSLEEP) in 1.79
+
 1.79	[2005-10-03]
 	- try nanosleep for emulating usleep -- may help in some weird
 	  embedded realtime places which have nanosleep but neither usleep
diff --git a/ext/Time/HiRes/HiRes.pm b/ext/Time/HiRes/HiRes.pm
index 54fe20d198..6dac1416fc 100644
--- a/ext/Time/HiRes/HiRes.pm
+++ b/ext/Time/HiRes/HiRes.pm
@@ -17,7 +17,7 @@ require DynaLoader;
 		 d_usleep d_ualarm d_gettimeofday d_getitimer d_setitimer
 		 d_nanosleep d_clock_gettime d_clock_getres);
 	
-$VERSION = '1.79';
+$VERSION = '1.80';
 $XS_VERSION = $VERSION;
 $VERSION = eval $VERSION;
 
@@ -119,8 +119,8 @@ C<gettimeofday>, and C<setitimer>/C<getitimer> calls.
 
 If your system lacks C<gettimeofday()> or an emulation of it you don't
 get C<gettimeofday()> or the one-argument form of C<tv_interval()>.
-If your system lacks all of C<nanosleep()>, C<usleep()>, and
-C<select()>, you don't get C<Time::HiRes::usleep()>,
+If your system lacks all of C<nanosleep()>, C<usleep()>, C<select()>,
+and C<poll()>, you don't get C<Time::HiRes::usleep()>,
 C<Time::HiRes::nanosleep()>, or C<Time::HiRes::sleep()>.  If your
 system lacks both C<ualarm()> and C<setitimer()> you don't get
 C<Time::HiRes::ualarm()> or C<Time::HiRes::alarm()>.
@@ -318,13 +318,13 @@ of C<CLOCK_REALTIME>,  see L</clock_gettime>.
   use Time::HiRes qw(usleep ualarm gettimeofday tv_interval);
 
   $microseconds = 750_000;
-  usleep $microseconds;
+  usleep($microseconds);
 
   # signal alarm in 2.5s & every .1s thereafter
-  ualarm 2_500_000, 100_000;	
+  ualarm(2_500_000, 100_000);
 
   # get seconds and microseconds since the epoch
-  ($s, $usec) = gettimeofday;
+  ($s, $usec) = gettimeofday();
 
   # measure elapsed time 
   # (could also do by subtracting 2 gettimeofday return values)
diff --git a/ext/Time/HiRes/HiRes.xs b/ext/Time/HiRes/HiRes.xs
index 666de93873..246353103a 100644
--- a/ext/Time/HiRes/HiRes.xs
+++ b/ext/Time/HiRes/HiRes.xs
@@ -361,7 +361,8 @@ gettimeofday (struct timeval *tp, void *tpz)
 
 
  /* Do not use H A S _ N A N O S L E E P
-  * so that Perl Configure doesn't scan for it.
+  * so that Perl Configure doesn't scan for it (and pull in -lrt and
+  * the like which are not usually good ideas for the default Perl).
   * (We are part of the core perl now.)
   * The TIME_HIRES_NANOSLEEP is set by Makefile.PL. */
 #if !defined(HAS_USLEEP) && defined(TIME_HIRES_NANOSLEEP)
@@ -409,7 +410,7 @@ hrt_usleep(unsigned long usec)
 }
 #endif /* #if !defined(HAS_USLEEP) && defined(WIN32) */
 
-#if !defined(HAS_USLEEP) && defined(HAS_NANOSLEEP)
+#if !defined(HAS_USLEEP) && defined(TIME_HIRES_NANOSLEEP)
 #define HAS_USLEEP
 #define usleep hrt_usleep  /* could conflict with ncurses for static build */