# HG changeset patch
# User Andreas Schwab <schwab@linux-m68k.org>
# Date 1278423214 -7200
# Node ID 004119b4b62eec20a96bb159c08389a2bb909360
# Parent  3f9a67cdf9f7e491a452ed48a809fa448628f31f
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.

diff -r 3f9a67cdf9f7 -r 004119b4b62e src/ChangeLog
--- a/src/ChangeLog	Tue Jul 06 13:50:35 2010 +0200
+++ b/src/ChangeLog	Tue Jul 06 15:33:34 2010 +0200
@@ -1,3 +1,10 @@
+2010-07-06  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* 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.
+
 2010-07-06  Dan Nicolaescu  <dann@ics.uci.edu>
 
 	* ecrt0.c: Revert conversion to standard C.
diff -r 3f9a67cdf9f7 -r 004119b4b62e src/keyboard.c
--- a/src/keyboard.c	Tue Jul 06 13:50:35 2010 +0200
+++ b/src/keyboard.c	Tue Jul 06 15:33:34 2010 +0200
@@ -6581,7 +6581,6 @@
 #ifdef HAVE_WINDOW_SYSTEM
       if (NILP (value))
 	{
-	  extern char *x_get_keysym_name (KeySym keysym);
 	  char *name = x_get_keysym_name (symbol_num);
 	  if (name)
 	    value = intern (name);
diff -r 3f9a67cdf9f7 -r 004119b4b62e src/lisp.h
--- a/src/lisp.h	Tue Jul 06 13:50:35 2010 +0200
+++ b/src/lisp.h	Tue Jul 06 15:33:34 2010 +0200
@@ -3469,6 +3469,11 @@
 extern void syms_of_xterm (void);
 #endif /* HAVE_X_WINDOWS */
 
+#ifdef HAVE_WINDOW_SYSTEM
+/* Defined in xterm.c, nsterm.m, w32term.c */
+extern char *x_get_keysym_name (int);
+#endif /* HAVE_WINDOW_SYSTEM */
+
 #ifdef MSDOS
 /* Defined in msdos.c */
 EXFUN (Fmsdos_downcase_filename, 1);
diff -r 3f9a67cdf9f7 -r 004119b4b62e src/xterm.c
--- 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;