From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Emanuele Giaquinta Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] Changes to emacs/src/emacs.c,v Date: Tue, 29 Jul 2008 00:46:40 +0200 Message-ID: <20080728224640.GB894@orion.lan> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1217285225 759 80.91.229.12 (28 Jul 2008 22:47:05 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 28 Jul 2008 22:47:05 +0000 (UTC) Cc: emacs-devel@gnu.org To: Dan Nicolaescu Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Jul 29 00:47:54 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 1KNbVP-0008K4-FU for ged-emacs-devel@m.gmane.org; Tue, 29 Jul 2008 00:47:51 +0200 Original-Received: from localhost ([127.0.0.1]:56507 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KNbUV-0004e9-DF for ged-emacs-devel@m.gmane.org; Mon, 28 Jul 2008 18:46:55 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1KNbUO-0004ct-Vs for emacs-devel@gnu.org; Mon, 28 Jul 2008 18:46:49 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1KNbUM-0004bt-GV for emacs-devel@gnu.org; Mon, 28 Jul 2008 18:46:48 -0400 Original-Received: from [199.232.76.173] (port=41488 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1KNbUM-0004bq-BL for emacs-devel@gnu.org; Mon, 28 Jul 2008 18:46:46 -0400 Original-Received: from fg-out-1718.google.com ([72.14.220.159]:57801) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1KNbUL-0001TY-VT for emacs-devel@gnu.org; Mon, 28 Jul 2008 18:46:46 -0400 Original-Received: by fg-out-1718.google.com with SMTP id l26so2191267fgb.30 for ; Mon, 28 Jul 2008 15:46:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:date:from:to:cc:subject :message-id:references:mime-version:content-type:content-disposition :in-reply-to; bh=M1JO4grhgZ6mj/w/Y8YvICvSTpgbpADZIR96LUSoF7o=; b=GBvVFvH65iGsiKUZcbA8ZJ3GqrnNnGzh7VhihjslE8WAhV78/d80zuJ3/QwClr8qzz Uy53fUOwlY1t3LFYVu0TXSvzGG8NGZ9voHPZNhyb7IHCrXP2agdXGQZP7dUfCVMnTzkq ervxoHEtdGM9UifqHodvFgnrQK4qzjqHb+vto= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=date:from:to:cc:subject:message-id:references:mime-version :content-type:content-disposition:in-reply-to; b=NydqGOSBTrYYjmHk61ZLdSnOv/NpISyr4aoQPu+b/QqX20mz8J8+pEI2K1YvrcKSFB KOkJQD/sxK0UH7C8nJP4akxRdOogUypQuLmrUZtQZ+CWZYfzUM7z5XPXNrW7XIKpb6wp yKd7PhsmaE+cRWqTbPhxGWnF3g5SfucrzIfq8= Original-Received: by 10.86.29.8 with SMTP id c8mr3054132fgc.23.1217285204405; Mon, 28 Jul 2008 15:46:44 -0700 (PDT) Original-Received: from localhost ( [82.53.45.190]) by mx.google.com with ESMTPS id 3sm14722650fge.3.2008.07.28.15.46.42 (version=TLSv1/SSLv3 cipher=RC4-MD5); Mon, 28 Jul 2008 15:46:43 -0700 (PDT) Content-Disposition: inline In-Reply-To: X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) 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:101659 Archived-At: 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. I didn't check if there are similar changes to revert as well. Emanuele