From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Feb 2016 08:26:00 +0000 (-0800)
Subject: Avoid aligned_alloc static/extern collision
X-Git-Tag: emacs-26.0.90~2692
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=fff8bfc8d831faf76a80b44b15c6b6c190a1cd52;p=emacs.git

Avoid aligned_alloc static/extern collision

* src/alloc.c (aligned_alloc): Define to private name when a
static function, to avoid collision with lisp.h extern decl.
Reported by John Yates in:
http://lists.gnu.org/archive/html/emacs-devel/2016-02/msg00439.html
---

diff --git a/src/alloc.c b/src/alloc.c
index 92945bc8afc..7364d7c4047 100644
--- 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)
 {