Mercurial > emacs

diff src/lisp.h @ 109151:004119b4b62e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Andreas Schwab <schwab@linux-m68k.org>
date Tue, 06 Jul 2010 15:33:34 +0200
parents 71150397fb59
children 6f7fb6d5f0f9
line wrap: on
line diff
--- 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);