diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-02-09 00:26:00 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-02-09 00:26:23 -0800 |
| commit | fff8bfc8d831faf76a80b44b15c6b6c190a1cd52 (patch) | |
| tree | b35e9a61577c7dfb0d23f452e8186079552fef6a | |
| parent | 68f06909711dc87eb7af7d32424578db6667a395 (diff) | |
| download | emacs-fff8bfc8d831faf76a80b44b15c6b6c190a1cd52.tar.gz emacs-fff8bfc8d831faf76a80b44b15c6b6c190a1cd52.tar.bz2 emacs-fff8bfc8d831faf76a80b44b15c6b6c190a1cd52.zip | |
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
| -rw-r--r-- | src/alloc.c | 1 |
1 files changed, 1 insertions, 0 deletions
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) { |