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: Mon, 28 Jul 2008 15:59:21 -0700 Message-ID: <200807282259.m6SMxLOj027630@sallyv1.ics.uci.edu> References: <20080728224640.GB894@orion.lan> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1217286034 3101 80.91.229.12 (28 Jul 2008 23:00:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 28 Jul 2008 23:00:34 +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 01:01:24 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 1KNbiP-0003ck-HL for ged-emacs-devel@m.gmane.org; Tue, 29 Jul 2008 01:01:17 +0200 Original-Received: from localhost ([127.0.0.1]:59171 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KNbhV-0000HO-LU for ged-emacs-devel@m.gmane.org; Mon, 28 Jul 2008 19:00:21 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KNbhN-0000FD-Km for emacs-devel@gnu.org; Mon, 28 Jul 2008 19:00:13 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KNbhL-0000Ec-Vm for emacs-devel@gnu.org; Mon, 28 Jul 2008 19:00:13 -0400 Original-Received: from [199.232.76.173] (port=38029 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KNbhL-0000EW-PW for emacs-devel@gnu.org; Mon, 28 Jul 2008 19:00:11 -0400 Original-Received: from sallyv1.ics.uci.edu ([128.195.1.109]:35666) by monty-python.gnu.org with esmtps (TLS-1.0:DHE_RSA_3DES_EDE_CBC_SHA1:24) (Exim 4.60) (envelope-from ) id 1KNbhL-0002rA-4o for emacs-devel@gnu.org; Mon, 28 Jul 2008 19:00:11 -0400 X-ICS-MailScanner-Watermark: 1217890761.4948@ER6ApFUL+QDx4sLBrgRi3Q 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 m6SMxLOj027630; Mon, 28 Jul 2008 15:59:21 -0700 (PDT) In-Reply-To: <20080728224640.GB894@orion.lan> (Emanuele Giaquinta's message of "Tue, 29 Jul 2008 00:46:40 +0200") Original-Lines: 37 X-ICS-MailScanner: Found to be clean X-ICS-MailScanner-SpamCheck: not spam, SpamAssassin (score=1.621, required 5, autolearn=disabled, ALL_TRUSTED -1.44, FM_MULTI_ODD2 1.10, URIBL_BLACK 1.96) X-ICS-MailScanner-SpamScore: s 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:101660 Archived-At: Emanuele Giaquinta writes: > On Sun, Jul 27, 2008 at 06:25:06PM +0000, Dan Nicolaescu wrote: > > > CVSROOT: /cvsroot/emacs > > Module name: emacs > > Changes by: Dan Nicolaescu 08/07/27 18:24:49 > > > > Index: src/emacs.c > > =================================================================== > > RCS file: /cvsroot/emacs/emacs/src/emacs.c,v > > retrieving revision 1.437 > > retrieving revision 1.438 > > diff -u -b -r1.437 -r1.438 > > --- src/emacs.c 23 Jul 2008 23:37:17 -0000 1.437 > > +++ src/emacs.c 27 Jul 2008 18:24:40 -0000 1.438 > > @@ -837,7 +837,7 @@ > > run_time_remap (argv[0]); > > #endif > > > > -#if defined (MAC_OSX) || defined (NS_IMPL_COCOA) > > +#if defined (NS_IMPL_COCOA) > > if (!initialized) > > unexec_init_emacs_zone (); > > #endif > > This hunk is wrong and breaks malloc on os x when building without > toolkit. The reason to have two macros, MAC_OSX and HAVE_CARBON, was to > distinguish bare os x support from carbon gui AFAIU. 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?