1 files changed, 14 insertions, 8 deletions

diff --git a/configure b/configure
index 2c8016f03be..c16f2fa6230 100755
--- a/configure
+++ b/configure
@@ -16007,6 +16007,7 @@ cat >>conftest.$ac_ext <<_ACEOF
 # endif
 #endif
 
+#include <limits.h>
 #include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
@@ -16155,12 +16156,15 @@ main ()
      isn't worth using anyway.  */
   alarm (60);
 
-  for (time_t_max = 1; 0 < time_t_max; time_t_max *= 2)
-    continue;
-  time_t_max--;
-  if ((time_t) -1 < 0)
-    for (time_t_min = -1; (time_t) (time_t_min * 2) < 0; time_t_min *= 2)
-      continue;
+  for (;;)
+    {
+      t = (time_t_max << 1) + 1;
+      if (t <= time_t_max)
+        break;
+      time_t_max = t;
+    }
+  time_t_min = - ((time_t) ~ (time_t) 0 == (time_t) -1) - time_t_max;
+
   delta = time_t_max / 997; /* a suitable prime number */
   for (i = 0; i < N_STRINGS; i++)
     {
@@ -16175,10 +16179,12 @@ main ()
              && mktime_test ((time_t) (60 * 60 * 24))))
         return 1;
 
-      for (j = 1; 0 < j; j *= 2)
+      for (j = 1; ; j <<= 1)
         if (! bigtime_test (j))
           return 1;
-      if (! bigtime_test (j - 1))
+        else if (INT_MAX / 2 < j)
+          break;
+      if (! bigtime_test (INT_MAX))
         return 1;
     }
   return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());