[Emacs-diffs] /srv/bzr/emacs/trunk r100733: Fix conflicting declarations of x_get_keysym_name

[Andreas Schwab]

------------------------------------------------------------
revno: 100733
committer: Andreas Schwab <address@hidden>
branch nick: emacs
timestamp: Tue 2010-07-06 15:33:34 +0200
message:
  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.
modified:
  src/ChangeLog
  src/keyboard.c
  src/lisp.h
  src/xterm.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2010-07-06 02:22:54 +0000
+++ b/src/ChangeLog     2010-07-06 13:33:34 +0000
@@ -1,3 +1,10 @@
+2010-07-06  Andreas Schwab  <address@hidden>
+
+       * 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  <address@hidden>
 
        * ecrt0.c: Revert conversion to standard C.

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2010-07-05 16:29:35 +0000
+++ b/src/keyboard.c    2010-07-06 13:33:34 +0000
@@ -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);

=== modified file 'src/lisp.h'
--- a/src/lisp.h        2010-07-03 07:44:17 +0000
+++ b/src/lisp.h        2010-07-06 13:33:34 +0000
@@ -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);

=== modified file 'src/xterm.c'
--- a/src/xterm.c       2010-07-05 10:28:27 +0000
+++ b/src/xterm.c       2010-07-06 13:33:34 +0000
@@ -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;