Merge 'master' into noverlay

1 files changed, 14 insertions, 24 deletions

diff --git a/lib/strtoimax.c b/lib/strtoimax.c
index f7d46f040d7..cad12d0d9be 100644
--- a/lib/strtoimax.c
+++ b/lib/strtoimax.c
@@ -1,19 +1,19 @@
 /* Convert string representation of a number into an intmax_t value.
 
-   Copyright (C) 1999, 2001-2004, 2006, 2009-2017 Free Software Foundation,
+   Copyright (C) 1999, 2001-2004, 2006, 2009-2022 Free Software Foundation,
    Inc.
 
-   This program is free software: you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
+   This file is free software: you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation, either version 3 of the
+   License, or (at your option) any later version.
 
-   This program is distributed in the hope that it will be useful,
+   This file is distributed in the hope that it will be useful,
    but WITHOUT ANY WARRANTY; without even the implied warranty of
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
+   GNU Lesser General Public License for more details.
 
-   You should have received a copy of the GNU General Public License
+   You should have received a copy of the GNU Lesser General Public License
    along with this program.  If not, see <https://www.gnu.org/licenses/>.  */
 
 /* Written by Paul Eggert. */
@@ -28,36 +28,30 @@
 #include "verify.h"
 
 #ifdef UNSIGNED
-# if HAVE_UNSIGNED_LONG_LONG_INT
-#  ifndef HAVE_DECL_STRTOULL
+# ifndef HAVE_DECL_STRTOULL
 "this configure-time declaration test was not run"
-#  endif
-#  if !HAVE_DECL_STRTOULL
+# endif
+# if !HAVE_DECL_STRTOULL
 unsigned long long int strtoull (char const *, char **, int);
-#  endif
 # endif
 
 #else
 
-# if HAVE_LONG_LONG_INT
-#  ifndef HAVE_DECL_STRTOLL
+# ifndef HAVE_DECL_STRTOLL
 "this configure-time declaration test was not run"
-#  endif
-#  if !HAVE_DECL_STRTOLL
+# endif
+# if !HAVE_DECL_STRTOLL
 long long int strtoll (char const *, char **, int);
-#  endif
 # endif
 #endif
 
 #ifdef UNSIGNED
-# define Have_long_long HAVE_UNSIGNED_LONG_LONG_INT
 # define Int uintmax_t
 # define Strtoimax strtoumax
 # define Strtol strtoul
 # define Strtoll strtoull
 # define Unsigned unsigned
 #else
-# define Have_long_long HAVE_LONG_LONG_INT
 # define Int intmax_t
 # define Strtoimax strtoimax
 # define Strtol strtol
@@ -68,15 +62,11 @@ long long int strtoll (char const *, char **, int);
 Int
 Strtoimax (char const *ptr, char **endptr, int base)
 {
-#if Have_long_long
   verify (sizeof (Int) == sizeof (Unsigned long int)
           || sizeof (Int) == sizeof (Unsigned long long int));
 
   if (sizeof (Int) != sizeof (Unsigned long int))
     return Strtoll (ptr, endptr, base);
-#else
-  verify (sizeof (Int) == sizeof (Unsigned long int));
-#endif
 
   return Strtol (ptr, endptr, base);
 }