* editfns.c (Fuser_full_name): Replace the only use of

USER_FULL_NAME with its value.
* config.in: Regenerate.

* configure.in (freebsd, kfreebsd): Undo part of previous change.
(USER_FULL_NAME): Remove, not used anymore.
* configure: Regenerate.

1 files changed, 11 insertions, 17 deletions

diff --git a/configure b/configure
index 54ece25cda9..bb726499e2c 100755
--- a/configure
+++ b/configure
@@ -2405,17 +2405,17 @@ machine='' opsys='' unported=no
 case "${canonical}" in
 
   ## FreeBSD ports
-  *-*-*freebsd* )
+  *-*-freebsd* )
     opsys=freebsd
     case "${canonical}" in
       alpha*-*-freebsd*)        machine=alpha ;;
       arm*-*-freebsd*)          machine=arm ;;
       ia64-*-freebsd*)          machine=ia64 ;;
-      sparc-*-freebsd*)         machine=sparc ;;
+      sparc-*-freebsd*)         machine=sparc ;;
       sparc64-*-freebsd*)       machine=sparc ;;
       powerpc-*-freebsd*)       machine=macppc ;;
       i[3456]86-*-freebsd*)     machine=intel386 ;;
-      amd64-*-freebsd*|x86_64-*-*freebsd*) machine=amdx86-64 ;;
+      amd64-*-freebsd*|x86_64-*-freebsd*) machine=amdx86-64 ;;
     esac
   ;;
 
@@ -16933,7 +16933,6 @@ cat >>conftest.$ac_ext <<_ACEOF
 # endif
 #endif
 
-#include <limits.h>
 #include <stdlib.h>
 
 #ifdef HAVE_UNISTD_H
@@ -17082,15 +17081,12 @@ main ()
      isn't worth using anyway.  */
   alarm (60);
 
-  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;
-
+  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;
   delta = time_t_max / 997; /* a suitable prime number */
   for (i = 0; i < N_STRINGS; i++)
     {
@@ -17105,12 +17101,10 @@ main ()
              && mktime_test ((time_t) (60 * 60 * 24))))
         return 1;
 
-      for (j = 1; ; j <<= 1)
+      for (j = 1; 0 < j; j *= 2)
         if (! bigtime_test (j))
           return 1;
-        else if (INT_MAX / 2 < j)
-          break;
-      if (! bigtime_test (INT_MAX))
+      if (! bigtime_test (j - 1))
         return 1;
     }
   return ! (irix_6_4_bug () && spring_forward_gap () && year_2050_test ());