]> Savannah Git Hosting - gnulib.git/commitdiff
immutable: Avoid redefining macros on AIX.
authorCollin Funk <collin.funk1@gmail.com>
Sat, 12 Apr 2025 19:30:30 +0000 (12:30 -0700)
committerCollin Funk <collin.funk1@gmail.com>
Sat, 12 Apr 2025 19:30:30 +0000 (12:30 -0700)
* lib/immutable.c (ALIGNMENT): Undefine any definition from system
headers.

ChangeLog
lib/immutable.c

index 0fac61a31ecc4a85f4a78d31131b0c038fe670c8..bfea3baf1294576821da31310ebe9ba18b1b4071 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2025-04-12  Collin Funk  <collin.funk1@gmail.com>
+
+       immutable: Avoid redefining macros on AIX.
+       * lib/immutable.c (ALIGNMENT): Undefine any definition from system
+       headers.
+
 2025-04-12  Bruno Haible  <bruno@clisp.org>
 
        is*_l, fnmatch tests: Avoid test failures on macOS 15.4.
index 42adc24615e1d0be18c6dc17b7194367c58bdaeb..012740703b5a63a1aeb0f81413d4648aae578ccc 100644 (file)
@@ -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