From 83a07409b06600750ad194aed8989ae1df3f6140 Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Sat, 12 Apr 2025 12:30:30 -0700 Subject: [PATCH] immutable: Avoid redefining macros on AIX. * lib/immutable.c (ALIGNMENT): Undefine any definition from system headers. --- ChangeLog | 6 ++++++ lib/immutable.c | 4 ++++ 2 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 0fac61a31e..bfea3baf12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2025-04-12 Collin Funk + + immutable: Avoid redefining macros on AIX. + * lib/immutable.c (ALIGNMENT): Undefine any definition from system + headers. + 2025-04-12 Bruno Haible is*_l, fnmatch tests: Avoid test failures on macOS 15.4. diff --git a/lib/immutable.c b/lib/immutable.c index 42adc24615..012740703b 100644 --- a/lib/immutable.c +++ b/lib/immutable.c @@ -275,6 +275,10 @@ free_pages (uintptr_t pages, size_t size) # define ALLOC_PAGES alloc_pages # define FREE_PAGES free_pages +/* Avoid redefined macro on AIX. */ +# ifdef ALIGNMENT +# undef ALIGNMENT +# endif # define ALIGNMENT sizeof (void *) # define PAGE_RESERVED_HEADER_SIZE SHARED_LINK_HEADER_SIZE -- 2.39.5