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.

4 files changed, 13 insertions, 2 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index bdde8339b50..bd2aba266cc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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 --git a/src/keyboard.c b/src/keyboard.c
index 001ae9f7cef..2cf7a7b24a6 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -6581,7 +6581,6 @@ modify_event_symbol (int symbol_num, unsigned int modifiers, Lisp_Object symbol_
 #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 --git a/src/lisp.h b/src/lisp.h
index 2f4f3755ab8..4874985abf4 100644
--- a/src/lisp.h
+++ b/src/lisp.h
@@ -3469,6 +3469,11 @@ extern void syms_of_xselect (void);
 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 --git a/src/xterm.c b/src/xterm.c
index ad254fc469a..bcb52274a94 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -3595,7 +3595,7 @@ x_emacs_to_x_modifiers (struct x_display_info *dpyinfo, unsigned int state)
 /* Convert a keysym to its name.  */
 
 char *
-x_get_keysym_name (KeySym keysym)
+x_get_keysym_name (int keysym)
 {
   char *value;