From: Alejandro Colomar <alx@kernel.org>
Date: Tue, 11 Nov 2025 13:29:28 +0000 (+0100)
Subject: stdio-common: Assume support for 'long long'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=67494ceb5d4b4ea59e9c360bbcd22447bd2329f5;p=thirdparty%2Fglibc.git

stdio-common: Assume support for 'long long'

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>
---

diff --git a/stdio-common/vfscanf-internal.c b/stdio-common/vfscanf-internal.c
index 63b9246e47..59fc8208aa 100644
--- a/stdio-common/vfscanf-internal.c
+++ b/stdio-common/vfscanf-internal.c
@@ -33,13 +33,6 @@
 #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)