Re: [Emacs-diffs] Changes to emacs/src/emacs.c,v

[Dan Nicolaescu]

Emanuele Giaquinta <address@hidden> writes:

  > On Sun, Jul 27, 2008 at 06:25:06PM +0000, Dan Nicolaescu wrote:
  > 
  > > CVSROOT:  /cvsroot/emacs
  > > Module name:      emacs
  > > Changes by:       Dan Nicolaescu <dann>   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?