Mercurial > emacs
changeset 109151:004119b4b62e
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 | 3f9a67cdf9f7 |
| children | e27859da5624 |
| files | src/ChangeLog src/keyboard.c src/lisp.h src/xterm.c |
| diffstat | 4 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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.
--- 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);
--- 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);