summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--modules/aligned-malloc3
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3b2773fb48..7554f5ba03 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2023-01-09 Bruno Haible <bruno@clisp.org>
+ aligned-malloc: Don't disturb the module aligned_alloc.
+ * modules/aligned-malloc (configure.ac): Test for aligned_alloc in the
+ same way as module aligned_alloc does.
+
+2023-01-09 Bruno Haible <bruno@clisp.org>
+
malloc-h: Improve portability.
* lib/malloc.in.h: Use INCLUDE_NEXT_AS_FIRST_DIRECTIVE when possible.
* modules/malloc-h (Makefile.am): Substitute
diff --git a/modules/aligned-malloc b/modules/aligned-malloc
index 018069510f..1ef05d1b76 100644
--- a/modules/aligned-malloc
+++ b/modules/aligned-malloc
@@ -14,7 +14,8 @@ memalign
configure.ac:
gl_MALLOC_ALIGNMENT
AC_REQUIRE([AC_C_INLINE])
-AC_CHECK_FUNCS_ONCE([posix_memalign aligned_alloc memalign])
+AC_CHECK_FUNCS_ONCE([posix_memalign memalign])
+gl_CHECK_FUNCS_ANDROID([aligned_alloc], [[#include <stdlib.h>]])
Makefile.am: