[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] master fff8bfc: Avoid aligned_alloc static/extern collisio
From: |
Paul Eggert |
Subject: |
[Emacs-diffs] master fff8bfc: Avoid aligned_alloc static/extern collision |
Date: |
Tue, 09 Feb 2016 08:26:28 +0000 |
branch: master
commit fff8bfc8d831faf76a80b44b15c6b6c190a1cd52
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>
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
---
src/alloc.c | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/alloc.c b/src/alloc.c
index 92945bc..7364d7c 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)
{
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] master fff8bfc: Avoid aligned_alloc static/extern collision,
Paul Eggert <=