From 24ee7c2cc008e25337ea8d5a6cc947dcc0b5a286 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 16 Jan 2025 21:14:45 +0100 Subject: [PATCH] wchar_h: Fix for glibc 2.5. * lib/wchar.in.h (__need_wint_t): Clean up after including glibc's . --- ChangeLog | 6 ++++++ lib/wchar.in.h | 5 ++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index e49455b109..5d4022fb47 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2025-01-16 Bruno Haible + + wchar_h: Fix for glibc 2.5. + * lib/wchar.in.h (__need_wint_t): Clean up after including glibc's + . + 2025-01-14 Bruno Haible assert-h: Fix compilation error with gcc >= 13 on Solaris 11. diff --git a/lib/wchar.in.h b/lib/wchar.in.h index c70dbcb5ac..7f21c85d54 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -1,6 +1,6 @@ /* A substitute for ISO C99 , for platforms that have issues. - Copyright (C) 2007-2024 Free Software Foundation, Inc. + Copyright (C) 2007-2025 Free Software Foundation, Inc. This file is free software: you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as @@ -53,6 +53,9 @@ is completely included or is still being included. */ #@INCLUDE_NEXT@ @NEXT_WCHAR_H@ +/* The glibc 2.5 /usr/include/wchar.h defines __need_wint_t but never undefines + it. We need to do that here. */ +#undef __need_wint_t #else /* Normal invocation convention. */ -- 2.39.5