]> git.eshelyaron.com Git - emacs.git/commitdiff
Avoid aligned_alloc static/extern collision
authorPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Feb 2016 08:26:00 +0000 (00:26 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Tue, 9 Feb 2016 08:26:23 +0000 (00:26 -0800)
* 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

src/alloc.c

index 92945bc8afc45a966aee1494d8cfdf09a85cbf30..7364d7c4047bb1cc1a3842245a4be30c9b9a572b 100644 (file)
@@ -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)
 {