perllocale: Mention /l

[perl5.git] / cpan / Time-HiRes / HiRes.xs

diff --git a/cpan/Time-HiRes/HiRes.xs b/cpan/Time-HiRes/HiRes.xs
index 69eee69..1dc2a68 100644 (file)
--- a/cpan/Time-HiRes/HiRes.xs
+++ b/cpan/Time-HiRes/HiRes.xs
@@ -2,7 +2,7 @@
  * 
  * Copyright (c) 1996-2002 Douglas E. Wegscheid.  All rights reserved.
  * 
- * Copyright (c) 2002,2003,2004,2005,2006,2007,2008 Jarkko Hietaniemi.
+ * Copyright (c) 2002-2010 Jarkko Hietaniemi.
  * All rights reserved.
  * 
  * This program is free software; you can redistribute it and/or modify
@@ -461,20 +461,20 @@ hrt_usleep(unsigned long usec)
 #if defined(HAS_SETITIMER) && defined(ITIMER_REAL)
 
 static int
-hrt_ualarm_itimero(struct itimerval* itv, int usec, int uinterval)
+hrt_ualarm_itimero(struct itimerval *oitv, int usec, int uinterval)
 {
-   itv->it_value.tv_sec = usec / IV_1E6;
-   itv->it_value.tv_usec = usec % IV_1E6;
-   itv->it_interval.tv_sec = uinterval / IV_1E6;
-   itv->it_interval.tv_usec = uinterval % IV_1E6;
-   return setitimer(ITIMER_REAL, itv, 0);
+   struct itimerval itv;
+   itv.it_value.tv_sec = usec / IV_1E6;
+   itv.it_value.tv_usec = usec % IV_1E6;
+   itv.it_interval.tv_sec = uinterval / IV_1E6;
+   itv.it_interval.tv_usec = uinterval % IV_1E6;
+   return setitimer(ITIMER_REAL, &itv, oitv);
 }
 
 int
 hrt_ualarm_itimer(int usec, int uinterval)
 {
-  struct itimerval itv;
-  return hrt_ualarm_itimero(&itv, usec, uinterval);
+  return hrt_ualarm_itimero(NULL, usec, uinterval);
 }
 
 #ifdef HAS_UALARM
@@ -914,9 +914,11 @@ ualarm(useconds,uinterval=0)
          {
                struct itimerval itv;
                if (hrt_ualarm_itimero(&itv, useconds, uinterval)) {
-                 RETVAL = itv.it_value.tv_sec + IV_1E6 * itv.it_value.tv_usec;
-               } else {
+                 /* To conform to ualarm's interface, we're actually ignoring
+                    an error here.  */
                  RETVAL = 0;
+               } else {
+                 RETVAL = itv.it_value.tv_sec * IV_1E6 + itv.it_value.tv_usec;
                }
          }
 #else
@@ -942,9 +944,11 @@ alarm(seconds,interval=0)
          {
                struct itimerval itv;
                if (hrt_ualarm_itimero(&itv, useconds, uinterval)) {
-                 RETVAL = (NV)itv.it_value.tv_sec + (NV)itv.it_value.tv_usec / NV_1E6;
-               } else {
+                 /* To conform to alarm's interface, we're actually ignoring
+                    an error here.  */
                  RETVAL = 0;
+               } else {
+                 RETVAL = itv.it_value.tv_sec + ((NV)itv.it_value.tv_usec) / NV_1E6;
                }
          }
 #else