From: Paul Eggert <eggert@cs.ucla.edu>
To: John Yates <john@yates-sheets.org>,
Emacs developers <emacs-devel@gnu.org>
Subject: Re: alloc.c compilation error in current tip
Date: Tue, 9 Feb 2016 00:28:45 -0800 [thread overview]
Message-ID: <56B9A33D.1030905@cs.ucla.edu> (raw)
In-Reply-To: <CAJnXXoi3NoMaAtJ2YtfTXkuQAoMSNHKYq5BVeAVuuY6cGtVCbg@mail.gmail.com>
[-- Attachment #1: Type: text/plain, Size: 112 bytes --]
On second thought I think I see the problem. I installed the attached patch into
master; please give it a try.
[-- Attachment #2: 0001-Avoid-aligned_alloc-static-extern-collision.patch --]
[-- Type: text/x-diff, Size: 911 bytes --]
From 022b037ad2e11c6d2e07209a40163a3759ceac0d Mon Sep 17 00:00:00 2001
From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 9 Feb 2016 00:26:00 -0800
Subject: [PATCH] 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 file changed, 1 insertion(+)
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)
{
--
2.5.0
next prev parent reply other threads:[~2016-02-09 8:28 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-02-08 19:55 alloc.c compilation error in current tip John Yates
2016-02-09 3:51 ` Paul Eggert
2016-02-09 8:28 ` Paul Eggert [this message]
2016-02-09 13:48 ` John Yates
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=56B9A33D.1030905@cs.ucla.edu \
--to=eggert@cs.ucla.edu \
--cc=emacs-devel@gnu.org \
--cc=john@yates-sheets.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).