From xemacs-m  Tue Feb 11 13:15:17 1997
Received: from alphatech.com (erebus.alphatech.com [198.112.236.2])
	by xemacs.org (8.8.5/8.8.5) with SMTP id NAA24960
	for <xemacs-beta@xemacs.org>; Tue, 11 Feb 1997 13:14:37 -0600 (CST)
Received: from venus.alphatech.com by alphatech.com (4.1/SMI-4.1)
	id AA12786; Tue, 11 Feb 97 14:10:09 EST
Received: from pochacco.alphatech.com by venus.alphatech.com (4.1/SMI-4.1)
	id AA09617; Tue, 11 Feb 97 14:17:44 EST
Received: by pochacco.alphatech.com (SMI-8.6/SMI-SVR4)
	id OAA18220; Tue, 11 Feb 1997 14:08:45 -0500
Date: Tue, 11 Feb 1997 14:08:45 -0500
Message-Id: <199702111908.OAA18220@pochacco.alphatech.com>
From: greg@alphatech.com (Greg Klanderman)
To: xemacs-beta@xemacs.org (XEmacs beta list)
Subject: problems w/ 19.15b93 solaris 2.5 -- patch
Reply-To: greg@alphatech.com



try this patch to event-Xt.c
things seem to be working now for me
tho the doc strings warning is still there

g


--- /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
 static void
 x_to_emacs_keysym_sunos_bug (Lisp_Object *return_value_sunos_bug, /* #### */
-                             XEvent *event, int simple_p)
+                             XKeyPressedEvent *event, int simple_p)
 #else /* !SUNOS_GCC_L0_BUG */
 static Lisp_Object
 x_to_emacs_keysym (XKeyPressedEvent *event, int simple_p)
@@ -624,28 +624,28 @@
   if (keysym >= XK_exclam && keysym <= XK_asciitilde)
     /* We must assume that the X keysym numbers for the ASCII graphic
        characters are the same as their ASCII codes.  */
-    return make_char (keysym);
+    return (make_char (keysym));
 
   switch (keysym)
     {
       /* These would be handled correctly by the default case, but by
 	 special-casing them here we don't garbage a string or call intern().
 	 */
-    case XK_BackSpace:	return QKbackspace;
-    case XK_Tab:	return QKtab;
-    case XK_Linefeed:	return QKlinefeed;
-    case XK_Return:	return QKreturn;
-    case XK_Escape:	return QKescape;
-    case XK_space:	return QKspace;
-    case XK_Delete:	return QKdelete;
-    case 0:		return Qnil;
+    case XK_BackSpace:	return (QKbackspace);
+    case XK_Tab:	return (QKtab);
+    case XK_Linefeed:	return (QKlinefeed);
+    case XK_Return:	return (QKreturn);
+    case XK_Escape:	return (QKescape);
+    case XK_space:	return (QKspace);
+    case XK_Delete:	return (QKdelete);
+    case 0:		return (Qnil);
       /* This kludge prevents bogus Xlib compose conversions.
          Don't ask why. The following case must be removed when we
          switch to using XmbLookupString */
     case XK_Multi_key: XLookupString (event, dummy, 200, &keysym, 0);
       /* Fallthrough!! */
     default:
-      if (simple_p) return Qnil;
+      if (simple_p) return (Qnil);
       /* #### without return_value_sunos_bug, %l0 (GCC struct return pointer)
        * ####  gets roached (top 8 bits cleared) around this call.
        */
@@ -655,11 +655,11 @@
 	{
 	  char buf [255];
 	  sprintf (buf, "unknown_keysym_0x%X", (int) keysym);
-	  return KEYSYM (buf);
+	  return (KEYSYM (buf));
 	}
       /* If it's got a one-character name, that's good enough. */
       if (!name[1])
-	return make_char (name[0]);
+	return (make_char (name[0]));
       
       /* If it's in the "Keyboard" character set, downcase it.
 	 The case of those keysyms is too totally random for us to
@@ -678,9 +678,9 @@
 	    }
 	  }
 	  *s2 = 0;
-	  return KEYSYM (buf);
+	  return (KEYSYM (buf));
 	}
-      return KEYSYM (name);
+      return (KEYSYM (name));
     }
 #ifdef SUNOS_GCC_L0_BUG
 # undef return
@@ -692,7 +692,7 @@
 #ifdef SUNOS_GCC_L0_BUG
 /* #### */
 static Lisp_Object
-x_to_emacs_keysym (XEvent *event, int simple_p)
+x_to_emacs_keysym (XKeyPressedEvent *event, int simple_p)
 {
   Lisp_Object return_value_sunos_bug;
   x_to_emacs_keysym_sunos_bug (&return_value_sunos_bug, event, simple_p);

