; Merge from origin/emacs-25

[gnu-emacs] / src / alloc.c

diff --git a/src/alloc.c b/src/alloc.c
index 92945bc8afc45a966aee1494d8cfdf09a85cbf30..7364d7c4047bb1cc1a3842245a4be30c9b9a572b 100644 (file)
--- a/src/alloc.c
+++ b/src/alloc.c
@@ -1133,6 +1133,7 @@ lisp_free (void *block)
 #  define USE_ALIGNED_ALLOC 1
 # elif !defined HYBRID_MALLOC && defined HAVE_POSIX_MEMALIGN
 #  define USE_ALIGNED_ALLOC 1
+#  define aligned_alloc my_aligned_alloc /* Avoid collision with lisp.h.  */
 static void *
 aligned_alloc (size_t alignment, size_t size)
 {