From 605940e5578519d283fd9bf76f94e25421b1b1ea Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 18 Aug 2023 13:46:15 +0200 Subject: [PATCH] stddef: Don't unnecessarily override max_align_t on AIX 7.3 with gcc. * lib/stddef.in.h (max_align_t, GNULIB_defined_max_align_t): Don't define or override if HAVE_MAX_ALIGN_T is 1. --- ChangeLog | 6 ++++++ lib/stddef.in.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a0ecbd7dee..a99e79d970 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2023-08-18 Bruno Haible + + stddef: Don't unnecessarily override max_align_t on AIX 7.3 with gcc. + * lib/stddef.in.h (max_align_t, GNULIB_defined_max_align_t): Don't + define or override if HAVE_MAX_ALIGN_T is 1. + 2023-08-16 Bruno Haible mbrtoc32-regular: Make it work as expected on glibc 2.12. diff --git a/lib/stddef.in.h b/lib/stddef.in.h index 431e819b8b..bb18198c98 100644 --- a/lib/stddef.in.h +++ b/lib/stddef.in.h @@ -58,7 +58,7 @@ /* On AIX 7.2, with xlc in 64-bit mode, defines max_align_t to a type with alignment 4, but 'long' has alignment 8. */ -# if defined _AIX && defined __LP64__ +# if defined _AIX && defined __LP64__ && !@HAVE_MAX_ALIGN_T@ # if !GNULIB_defined_max_align_t # ifdef _MAX_ALIGN_T /* /usr/include/stddef.h has already defined max_align_t. Override it. */ -- 2.39.5