From xemacs-m  Tue Feb 11 16:01:19 1997
Received: from altair.xemacs.org (steve@xemacs.miranova.com [206.190.83.19])
	by xemacs.org (8.8.5/8.8.5) with ESMTP id QAA25517
	for <xemacs-beta@xemacs.org>; Tue, 11 Feb 1997 16:01:17 -0600 (CST)
Received: (from steve@localhost)
	by altair.xemacs.org (8.8.5/8.8.5) id OAA13771;
	Tue, 11 Feb 1997 14:12:41 -0800
Mail-Copies-To: never
To: xemacs-beta@xemacs.org
Subject: Re: problems w/ 19.15b93 solaris 2.5 -- patch
References: <199702111908.OAA18220@pochacco.alphatech.com>
X-Url: http://www.miranova.com/%7Esteve/
X-Face: #!T9!#9s-3o8)*uHlX{Ug[xW7E7Wr!*L46-OxqMu\xz23v|R9q}lH?cRS{rCNe^'[`^sr5"
 f8*@r4ipO6Jl!:Ccq<xoV[Qz2u8<8-+Vwf2gzJ44lf_/y9OaQ`@#Q65{U4/TC)i2`~/M&QI$X>p:9I
 OSS'2{-)-4wBnVeg0S\O4Al@)uC[pD|+
X-Attribution: sb
From: Steven L Baur <steve@miranova.com>
In-Reply-To: greg@alphatech.com's message of Tue, 11 Feb 1997 14:08:45 -0500
Mime-Version: 1.0 (generated by tm-edit 7.103)
Content-Type: text/plain; charset=US-ASCII
Date: 11 Feb 1997 14:12:39 -0800
Message-ID: <m2ybcvyotk.fsf@altair.xemacs.org>
Lines: 76
X-Mailer: Gnus v5.4.12/XEmacs 20.1

> --- /local/mstar/.backups/!local!mstar!software!xemacs!build!xemacs-19.15-b93!src!event-Xt.c.~1~	Sun Feb  9 18:52:30 1997
> +++ src/event-Xt.c	Tue Feb 11 13:59:46 1997
> @@ -599,7 +599,7 @@
>  #ifdef SUNOS_GCC_L0_BUG
          ^^^^^^^^^^^^^^^^

Ack!  I thought that garbage got synched out of 19.15.  This ugly bug
workaround isn't needed anymore.  Try this patch instead (which
matches the current code in v20):

Index: event-Xt.c
===================================================================
RCS file: /usr/local/xemacs/xemacs-19.15/src/event-Xt.c,v
retrieving revision 1.5
diff -u -r1.5 event-Xt.c
--- event-Xt.c	1997/02/09 23:52:30	1.5
+++ event-Xt.c	1997/02/11 22:03:31
@@ -592,18 +592,8 @@
 /*                  X to Emacs event conversion                         */
 /************************************************************************/
 
-#if (defined(sun) || defined(__sun)) && defined(__GNUC__)
-# define SUNOS_GCC_L0_BUG
-#endif
-
-#ifdef SUNOS_GCC_L0_BUG
-static void
-x_to_emacs_keysym_sunos_bug (Lisp_Object *return_value_sunos_bug, /* #### */
-                             XEvent *event, int simple_p)
-#else /* !SUNOS_GCC_L0_BUG */
 static Lisp_Object
 x_to_emacs_keysym (XKeyPressedEvent *event, int simple_p)
-#endif /* !SUNOS_GCC_L0_BUG */
      /* simple_p means don't try too hard (ASCII only) */
 {
   char *name;
@@ -612,11 +602,6 @@
      passing in 0) to avoid crashes on German IRIX */
   char dummy[256];
 
-#ifdef SUNOS_GCC_L0_BUG
-# define return(lose) \
-  do {*return_value_sunos_bug = (lose); goto return_it; } while (0)
-#endif
-
   /* ### FIX this by replacing with calls to XmbLookupString.
      XLookupString should never be called. --mrb */
   XLookupString (event, dummy, 200, &keysym, 0);
@@ -682,23 +667,7 @@
 	}
       return KEYSYM (name);
     }
-#ifdef SUNOS_GCC_L0_BUG
-# undef return
- return_it:
-  return;
-#endif
-}
-
-#ifdef SUNOS_GCC_L0_BUG
-/* #### */
-static Lisp_Object
-x_to_emacs_keysym (XEvent *event, int simple_p)
-{
-  Lisp_Object return_value_sunos_bug;
-  x_to_emacs_keysym_sunos_bug (&return_value_sunos_bug, event, simple_p);
-  return (return_value_sunos_bug);
 }
-#endif
 
 static void
 set_last_server_timestamp (struct device *d, XEvent *x_event)

-- 
steve@miranova.com baur
Unsolicited commercial e-mail will be billed at $250/message.

