From xemacs-m  Sun Jul 20 11:28:21 1997
Received: from sol1.cybernet-ag.net (sol1.cybernet-ag.net [194.221.86.98])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id LAA29361
	for <xemacs-beta@xemacs.org>; Sun, 20 Jul 1997 11:28:18 -0500 (CDT)
Received: (from aseibert@localhost) by sol1.cybernet-ag.net  id SAA23431; Sun, 20 Jul 1997 18:26:27 +0200 (MET DST)
Date: Sun, 20 Jul 1997 18:26:27 +0200 (MET DST)
Message-Id: <199707201626.SAA23431@sol1.cybernet-ag.net>
From: Axel Seibert <aseibert@cybernet-ag.net>
To: xemacs-beta@xemacs.org
Subject: patch for emacs.c under NEXTSTEP

Hi!

The problems under NEXTSTEP are not sed related, but seem to be a bug
in NeXT's version of gcc (or in gcc 2.2.2 itself). The following
patch solves the problem:

diff -c src/emacs.c.orig src/emacs.c
*** src/emacs.c.orig    Sun Jul 20 17:46:01 1997
--- src/emacs.c Sun Jul 20 18:14:05 1997
***************
*** 452,459 ****
--- 452,463 ----
  
  /* Make stack traces always identify version + configuration */
  /* C makes this bizarre circumlocution necessary. */
+ #ifdef NeXT
+ #define PASTE_1(x,y) x##y
+ #else
  #define PASTE_1(x,y) PASTE_2(x,y)
  #define PASTE_2(x,y) x##y
+ #endif
  #define main_1 PASTE_1(main_, CANONICAL_VERSION)
  
  static DOESNT_RETURN

I guess, the two passes with PASTE_1 and PASTE_2 are necesary for some
other platforms, that's why I added an #ifdef NeXT. We can't get rid
of this PASTE_1/PASTE_2 generally, can we?

Thanx for all your help, anyway!
Axel

