Commit 7af07b96 authored by Andreas Schwab's avatar Andreas Schwab
Browse files

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.
parent 1725ae55
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.
......
......@@ -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);
......
......@@ -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);
......
......@@ -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;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment