diff src/xterm.c @ 109151:004119b4b62e

Fix conflicting declarations of x_get_keysym_name * xterm.c (x_get_keysym_name): Change type of parameter to int. * lisp.h: Declare x_get_keysym_name. * keyboard.c (modify_event_symbol): Don't declare x_get_keysym_name here.

--- a/src/xterm.c	Tue Jul 06 13:50:35 2010 +0200
+++ b/src/xterm.c	Tue Jul 06 15:33:34 2010 +0200
@@ -3595,7 +3595,7 @@
 /* Convert a keysym to its name.  */
 
 char *
-x_get_keysym_name (KeySym keysym)
+x_get_keysym_name (int keysym)
 {
   char *value;