From: Tulio Magno Quites Machado Filho <tuliom@redhat.com>
Date: Thu, 30 Jan 2025 18:51:01 +0000 (-0300)
Subject: libio: Replace __LP64__ with __WORDSIZE
X-Git-Tag: glibc-2.42~521
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=cdb0800022110bc68a033944f09e501be5bd72d7;p=thirdparty%2Fglibc.git

libio: Replace __LP64__ with __WORDSIZE

__LP64__ is a GCC extension and shouldn't be used in an installed
header.

Fixes: 596a61cf6b (libio: Start to return errors when flushing fwrite's buffer [BZ #29459], 2025-01-28)
Reported-by: Florian Weimer <fweimer@redhat.com>
Reviewed-by: Arjun Shankar <arjun@redhat.com>
---

diff --git a/libio/bits/types/struct_FILE.h b/libio/bits/types/struct_FILE.h
index 2012d70681..ac99002ae7 100644
--- a/libio/bits/types/struct_FILE.h
+++ b/libio/bits/types/struct_FILE.h
@@ -32,6 +32,7 @@
 #endif
 
 #include <bits/types.h>
+#include <bits/wordsize.h>
 
 struct _IO_FILE;
 struct _IO_marker;
@@ -97,11 +98,11 @@ struct _IO_FILE_complete
   void *_freeres_buf;
   struct _IO_FILE **_prevchain;
   int _mode;
-#ifdef __LP64__
+#if __WORDSIZE == 64
   int _unused3;
 #endif
   __uint64_t _total_written;
-#ifndef __LP64__
+#if __WORDSIZE == 32
   int _unused3;
 #endif
   /* Make sure we don't get into trouble again.  */