* lib/xnanosleep.c (xnanosleep): Don't assume GCC 4.3.0 behavior

when avoiding problems with integer overflow.  Use a portable test
instead.

diff --git a/ChangeLog b/ChangeLog
index a00164578f4f1e128cdaaee8976b61af8cb7044d..a8c5a9ec342d825c28d0b97905eae1f08c0caeb4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-10-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/xnanosleep.c (xnanosleep): Don't assume GCC 4.3.0 behavior
+       when avoiding problems with integer overflow.  Use a portable test
+       instead.
+
 2007-10-08  Simon Josefsson  <simon@josefsson.org>
 
        * modules/dummy (License): Change to LGPLv2+.

diff --git a/lib/xnanosleep.c b/lib/xnanosleep.c
index 22bd53a953fc2a4a68bc5db2e34be7ce7553253d..317e40ade5beb64349b96b319d06d6a28f6c6869 100644 (file)
--- a/lib/xnanosleep.c
+++ b/lib/xnanosleep.c
@@ -72,15 +72,13 @@ xnanosleep (double seconds)
   /* Normalize the interval length.  nanosleep requires this.  */
   if (BILLION <= ts_sleep.tv_nsec)
     {
-      /* Declare "volatile" so that gcc-4.3.0 doesn't optimize away
-        the overflow test.  */
-      volatile time_t t = ts_sleep.tv_sec + 1;
-
-      /* Detect integer overflow.  */
-      overflow |= (t < ts_sleep.tv_sec);
-
-      ts_sleep.tv_sec = t;
-      ts_sleep.tv_nsec -= BILLION;
+      if (ts_sleep.tv_sec == TIME_T_MAX)
+       overflow = true;
+      else
+       {
+         ts_sleep.tv_sec++;
+         ts_sleep.tv_nsec -= BILLION;
+       }
     }
 
   for (;;)