From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Paul Eggert Newsgroups: gmane.emacs.bugs Subject: bug#25128: Reorder lisp.h to declare types before using them Date: Sun, 25 Dec 2016 10:15:27 -0800 Organization: UCLA Computer Science Department Message-ID: References: <04822678-e178-4b23-1a5b-ff452cbd88a3@cs.ucla.edu> <83r35jiuvo.fsf@gnu.org> <79183a94-7a2c-18a2-9fa6-e2e4ead47ab9@cs.ucla.edu> <83a8bjyjn9.fsf@gnu.org> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------3EEF414C284977C7AAB8C6FA" X-Trace: blaine.gmane.org 1482689778 3982 195.159.176.226 (25 Dec 2016 18:16:18 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sun, 25 Dec 2016 18:16:18 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.5.1 Cc: 25128@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Sun Dec 25 19:16:09 2016 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cLDL5-0008Au-DW for geb-bug-gnu-emacs@m.gmane.org; Sun, 25 Dec 2016 19:16:07 +0100 Original-Received: from localhost ([::1]:47611 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cLDL9-0006Pt-So for geb-bug-gnu-emacs@m.gmane.org; Sun, 25 Dec 2016 13:16:11 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:42234) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cLDL3-0006Pj-I1 for bug-gnu-emacs@gnu.org; Sun, 25 Dec 2016 13:16:06 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cLDL0-0002yy-Dt for bug-gnu-emacs@gnu.org; Sun, 25 Dec 2016 13:16:05 -0500 Original-Received: from debbugs.gnu.org ([208.118.235.43]:39519) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cLDL0-0002yl-Ad for bug-gnu-emacs@gnu.org; Sun, 25 Dec 2016 13:16:02 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1cLDL0-0002fc-0A for bug-gnu-emacs@gnu.org; Sun, 25 Dec 2016 13:16:02 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Paul Eggert Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 25 Dec 2016 18:16:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 25128 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 25128-submit@debbugs.gnu.org id=B25128.148268973510229 (code B ref 25128); Sun, 25 Dec 2016 18:16:01 +0000 Original-Received: (at 25128) by debbugs.gnu.org; 25 Dec 2016 18:15:35 +0000 Original-Received: from localhost ([127.0.0.1]:54918 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cLDKZ-0002eu-I1 for submit@debbugs.gnu.org; Sun, 25 Dec 2016 13:15:35 -0500 Original-Received: from zimbra.cs.ucla.edu ([131.179.128.68]:51568) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cLDKX-0002ei-Uw for 25128@debbugs.gnu.org; Sun, 25 Dec 2016 13:15:34 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 5AA271600A8; Sun, 25 Dec 2016 10:15:28 -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 RtTuu2EMkhm6; Sun, 25 Dec 2016 10:15:27 -0800 (PST) Original-Received: from localhost (localhost [127.0.0.1]) by zimbra.cs.ucla.edu (Postfix) with ESMTP id 909621600AE; Sun, 25 Dec 2016 10:15:27 -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 GItdXehTgn8f; Sun, 25 Dec 2016 10:15:27 -0800 (PST) Original-Received: from [192.168.1.9] (unknown [47.153.178.162]) by zimbra.cs.ucla.edu (Postfix) with ESMTPSA id 678901600A8; Sun, 25 Dec 2016 10:15:27 -0800 (PST) In-Reply-To: <83a8bjyjn9.fsf@gnu.org> X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.org gmane.emacs.bugs:127443 Archived-At: This is a multi-part message in MIME format. --------------3EEF414C284977C7AAB8C6FA Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Eli Zaretskii wrote: > However, it breaks the MS-Windows 32-bit build --with-wide-int: Sorry about that. Should be fixed now, with the attached: --------------3EEF414C284977C7AAB8C6FA Content-Type: text/x-diff; name="0001-Fix-typo-in-lisp.h-reordering-patch.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-Fix-typo-in-lisp.h-reordering-patch.patch" >From 8c0f6ba65d4a277b0e99c3ce15c82f308d964f04 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sun, 25 Dec 2016 10:12:39 -0800 Subject: [PATCH] Fix typo in lisp.h reordering patch * src/lisp.h (XUNTAG) [!USE_LSB_TAG]: Remove duplicate defn. Reported by Eli Zaretskii (Bug#25128#19). --- src/lisp.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/lisp.h b/src/lisp.h index 23d3ae4..dc2c7a6 100644 --- a/src/lisp.h +++ b/src/lisp.h @@ -996,14 +996,6 @@ XFASTINT (Lisp_Object a) return n; } -/* Extract A's pointer value, assuming A's type is TYPE. */ -INLINE void * -XUNTAG (Lisp_Object a, int type) -{ - intptr_t i = USE_LSB_TAG ? XLI (a) - type : XLI (a) & VALMASK; - return (void *) i; -} - #endif /* ! USE_LSB_TAG */ /* Extract A's value as an unsigned integer. */ -- 2.7.4 --------------3EEF414C284977C7AAB8C6FA--