From 82770ee1d03abbe2d882feefd74173cfbe9a94ee Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 1 May 2024 23:10:51 +0200 Subject: [PATCH] stddef: Fix behaviour on Cygwin (regression 2024-04-27). MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reported by Markus Mützel in . * lib/stddef.in.h: Don't test _@GUARD_PREFIX@_STDDEF_H. Fix comments. --- ChangeLog | 7 +++++++ lib/stddef.in.h | 9 ++++----- 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8681066eee..21e52879f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2024-05-01 Bruno Haible + + stddef: Fix behaviour on Cygwin (regression 2024-04-27). + Reported by Markus Mützel in + . + * lib/stddef.in.h: Don't test _@GUARD_PREFIX@_STDDEF_H. Fix comments. + 2024-05-01 Bruno Haible doc: Reference a gcc bug. diff --git a/lib/stddef.in.h b/lib/stddef.in.h index fa249259cd..ac81257b5c 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -27,10 +27,9 @@ #endif @PRAGMA_COLUMNS@ -#if (!defined _@GUARD_PREFIX@_STDDEF_H \ - && (defined __need_wchar_t || defined __need_size_t \ - || defined __need_ptrdiff_t || defined __need_NULL \ - || defined __need_wint_t)) +#if (defined __need_wchar_t || defined __need_size_t \ + || defined __need_ptrdiff_t || defined __need_NULL \ + || defined __need_wint_t) /* Special invocation convention inside gcc header files. In particular, in some ancient versions of GCC blindly redefined NULL when __need_wint_t was defined, even though wint_t @@ -38,7 +37,7 @@ (FIXME: It's not clear what GCC versions those were - perhaps so ancient that we can stop worrying about this?) Although glibc 2.26 (2017) and later do not use __need_wint_t, - for portability to older Glibc + GCC, + for portability to macOS, Cygwin, Haiku, and older Glibc + GCC, remember if special invocation has ever been used to obtain wint_t, in which case we need to clean up NULL yet again. */ -- 2.39.5