From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.devel Subject: Re: alloc.c compilation error in current tip Date: Tue, 9 Feb 2016 00:28:45 -0800 Organization: UCLA Computer Science Department Message-ID: <56B9A33D.1030905@cs.ucla.edu> References: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------060308020806030002070806" X-Trace: ger.gmane.org 1455006559 1118 80.91.229.3 (9 Feb 2016 08:29:19 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 9 Feb 2016 08:29:19 +0000 (UTC) To: John Yates , Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Feb 09 09:29:10 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1aT3fZ-0006GL-3p for ged-emacs-devel@m.gmane.org; Tue, 09 Feb 2016 09:29:09 +0100 Original-Received: from localhost ([::1]:53107 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT3fY-000771-Fb for ged-emacs-devel@m.gmane.org; Tue, 09 Feb 2016 03:29:08 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:37284) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT3fI-00076s-PF for emacs-devel@gnu.org; Tue, 09 Feb 2016 03:28:53 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aT3fD-0006N5-PS for emacs-devel@gnu.org; Tue, 09 Feb 2016 03:28:52 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:45876) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aT3fD-0006Mu-J4 for emacs-devel@gnu.org; Tue, 09 Feb 2016 03:28:47 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 63A8B160D25; Tue, 9 Feb 2016 00:28:46 -0800 (PST) Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10032) with ESMTP id GWjD5vfsgpQD; Tue, 9 Feb 2016 00:28:45 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 69A53160F5C; Tue, 9 Feb 2016 00:28:45 -0800 (PST) X-Virus-Scanned: amavisd-new at zimbra.cs.ucla.edu Original-Received: from zimbra.cs.ucla.edu ([127.0.0.1]) by localhost (zimbra.cs.ucla.edu [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 6Tgddtyt3xcp; Tue, 9 Feb 2016 00:28:45 -0800 (PST) Original-Received: from [192.168.1.9] (pool-100-32-155-148.lsanca.fios.verizon.net [100.32.155.148]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 4863F160D25; Tue, 9 Feb 2016 00:28:45 -0800 (PST) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 In-Reply-To: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 131.179.128.68 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:199579 Archived-At: This is a multi-part message in MIME format. --------------060308020806030002070806 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit On second thought I think I see the problem. I installed the attached patch into master; please give it a try. --------------060308020806030002070806 Content-Type: text/x-diff; name="0001-Avoid-aligned_alloc-static-extern-collision.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Avoid-aligned_alloc-static-extern-collision.patch" >From 022b037ad2e11c6d2e07209a40163a3759ceac0d Mon Sep 17 00:00:00 2001 From: Paul Eggert 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 --------------060308020806030002070806--