]> git.ipfire.org Git - thirdparty/glibc.git/commitdiff
stdio-common: Assume support for 'long long'
authorAlejandro Colomar <alx@kernel.org>
Tue, 11 Nov 2025 13:29:28 +0000 (14:29 +0100)
committerCollin Funk <collin.funk1@gmail.com>
Sat, 31 Jan 2026 20:13:55 +0000 (12:13 -0800)
GCC supports 'long long' since essentially forever.

Signed-off-by: Alejandro Colomar <alx@kernel.org>
Reviewed-by: Paul Eggert <eggert@cs.ucla.edu>
Reviewed-by: Collin Funk <collin.funk1@gmail.com>
stdio-common/vfscanf-internal.c

index 63b9246e4784c4c90d4c0039e0fe748b9da48240..59fc8208aa9c3f97c31068225874c10e13529cbc 100644 (file)
 #include <locale/localeinfo.h>
 #include <scratch_buffer.h>
 
-#ifdef __GNUC__
-# define HAVE_LONGLONG
-# define LONGLONG      long long
-#else
-# define LONGLONG      long
-#endif
-
 /* Determine whether we have to handle `long long' at all.  */
 #if LONG_MAX == LONG_LONG_MAX
 # define need_longlong 0
@@ -1976,7 +1969,7 @@ digits_extended_fail:
              if (flags & NUMBER_SIGNED)
                {
                  if (need_longlong && (flags & LONGDBL))
-                   *ARG (LONGLONG int *) = num.q;
+                   *ARG (long long int *) = num.q;
                  else if (need_long && (flags & LONG))
                    *ARG (long int *) = num.l;
                  else if (flags & SHORT)
@@ -1989,7 +1982,7 @@ digits_extended_fail:
              else
                {
                  if (need_longlong && (flags & LONGDBL))
-                   *ARG (unsigned LONGLONG int *) = num.uq;
+                   *ARG (unsigned long long int *) = num.uq;
                  else if (need_long && (flags & LONG))
                    *ARG (unsigned long int *) = num.ul;
                  else if (flags & SHORT)