From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Dan Nicolaescu Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] Changes to emacs/src/emacs.c,v Date: Tue, 29 Jul 2008 07:00:01 -0700 Message-ID: <200807291400.m6TE01CZ011171@sallyv1.ics.uci.edu> References: <20080728224640.GB894@orion.lan> <200807282259.m6SMxLOj027630@sallyv1.ics.uci.edu> <20080728231851.GC894@orion.lan> <200807282328.m6SNScpc012745@sallyv1.ics.uci.edu> <20080729075853.GA1130@orion.lan> <200807291313.m6TDDUtf013397@sallyv1.ics.uci.edu> <20080729134021.GB1130@orion.lan> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1217340115 19255 80.91.229.12 (29 Jul 2008 14:01:55 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 29 Jul 2008 14:01:55 +0000 (UTC) Cc: emacs-devel@gnu.org To: Emanuele Giaquinta Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jul 29 16:02:44 2008 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1KNpmQ-0008Dz-VP for ged-emacs-devel@m.gmane.org; Tue, 29 Jul 2008 16:02:23 +0200 Original-Received: from localhost ([127.0.0.1]:58110 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KNplW-00046L-Pw for ged-emacs-devel@m.gmane.org; Tue, 29 Jul 2008 10:01:26 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KNpkO-0003le-Ft for emacs-devel@gnu.org; Tue, 29 Jul 2008 10:00:16 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KNpkL-0003kO-EA for emacs-devel@gnu.org; Tue, 29 Jul 2008 10:00:14 -0400 Original-Received: from [199.232.76.173] (port=46485 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KNpkL-0003kF-23 for emacs-devel@gnu.org; Tue, 29 Jul 2008 10:00:13 -0400 Original-Received: from sallyv1.ics.uci.edu ([128.195.1.109]:56017) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1KNpkK-00044e-DO for emacs-devel@gnu.org; Tue, 29 Jul 2008 10:00:12 -0400 X-ICS-MailScanner-Watermark: 1217944801.71727@7bRO8CMkK3gBCq1BFWrNtg Original-Received: from mothra.ics.uci.edu (mothra.ics.uci.edu [128.195.6.93]) by sallyv1.ics.uci.edu (8.13.7+Sun/8.13.7) with ESMTP id m6TE01CZ011171; Tue, 29 Jul 2008 07:00:01 -0700 (PDT) In-Reply-To: <20080729134021.GB1130@orion.lan> (Emanuele Giaquinta's message of "Tue, 29 Jul 2008 15:40:21 +0200") Original-Lines: 52 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=0.521, required 5, autolearn=disabled, ALL_TRUSTED -1.44, URIBL_BLACK 1.96) X-ICS-MailScanner-From: dann@mothra.ics.uci.edu X-detected-kernel: by monty-python.gnu.org: Solaris 10 (beta) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:101688 Archived-At: Emanuele Giaquinta writes: > On Tue, Jul 29, 2008 at 06:13:30AM -0700, Dan Nicolaescu wrote: > > > Emanuele Giaquinta writes: > > > > > On Mon, Jul 28, 2008 at 04:28:38PM -0700, Dan Nicolaescu wrote: > > > > > > > Emanuele Giaquinta writes: > > > > > > > > > On Mon, Jul 28, 2008 at 03:59:21PM -0700, Dan Nicolaescu wrote: > > > > > > > > > > > Unfortunately that is not what the code in configure.in said: > > > > > > > > > > > > /* TODO: These are used for the Carbon port only. */ > > > > > > #undef MAC_OS > > > > > > #undef MAC_OSX > > > > > > > > > > > > What is the right conditional there? > > > > > > > > > > I think the right conditional is to check only MAC_OSX (defined in > > > > > s/darwin.h), that code is required by unexmacosx.c. > > > > > > > > MAC_OSX is only define if !HAVE_NS, so that wouldn't be quite right > > > > either. > > > > > > Ah, I see. The previous conditional was correct then. > > > > It would make this particular code work, but it might not be enough. > > src/s/darwin.h should not be using -DMAC_OSX, it should put that in a > > #define, that is the point of darwin.h, to contain #defines. The macro > > should be documented properly in admin/CPP-DEFINES. Hopefully a mac > > person can take care of this. > > While I agree that using a #define rather than -D would be nicer, I do > not see what it would change wrt this issue. > MAC_OSX was documented in CPP-DEFINES, maybe the description could have > been better but I do not see what is wrong in reverting that hunk > that is not related to the carbon gui removal and breaks non toolkit > builds, the whole thing can be improved later if needed. We are going in circles here. MAC_OSX was documented in CPP-DEFINES in one way, the latest code added with the NextStep check in documented it with a completely different meaning: that is only used in Carbon. That is why references to MAC_OSX were completely removed when removing support for Carbon, with the exception of the code in src/s/darwin.h, which got a FIXME tag asking if it still needed. So yes, this needs fixing, but the mac people need to figure out what is the right way to do it, and add proper documentation to CPP-DEFINES. Meanwhile you can undo the change in your local tree.