From 9b2ad07978832af97d0104ea8ea591aba58abf4c Mon Sep 17 00:00:00 2001 From: Collin Funk Date: Sat, 12 Apr 2025 12:36:10 -0700 Subject: [PATCH] aligned-malloc tests: Avoid redefining macros on AIX. * tests/test-aligned-malloc.c (ALIGNMENT): Undefine any definition from system headers. --- ChangeLog | 4 ++++ tests/test-aligned-malloc.c | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/ChangeLog b/ChangeLog index bfea3baf12..0733b2b95a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2025-04-12 Collin Funk + aligned-malloc tests: Avoid redefining macros on AIX. + * tests/test-aligned-malloc.c (ALIGNMENT): Undefine any definition from + system headers. + immutable: Avoid redefining macros on AIX. * lib/immutable.c (ALIGNMENT): Undefine any definition from system headers. diff --git a/tests/test-aligned-malloc.c b/tests/test-aligned-malloc.c index fdb9371a9b..e577804d22 100644 --- a/tests/test-aligned-malloc.c +++ b/tests/test-aligned-malloc.c @@ -22,6 +22,10 @@ #include #include +/* Avoid redefinition on AIX. */ +#ifdef ALIGNMENT +# undef ALIGNMENT +#endif #define ALIGNMENT 4 #define aligned_malloc aligned4_malloc #define aligned_free aligned4_free -- 2.39.5