Mercurial > emacs
comparison src/lisp.h @ 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 | 71150397fb59 |
children | 6f7fb6d5f0f9 |
comparison
equal
deleted
inserted
replaced
109150:3f9a67cdf9f7 | 109151:004119b4b62e |
---|---|
3467 | 3467 |
3468 /* Defined in xterm.c */ | 3468 /* Defined in xterm.c */ |
3469 extern void syms_of_xterm (void); | 3469 extern void syms_of_xterm (void); |
3470 #endif /* HAVE_X_WINDOWS */ | 3470 #endif /* HAVE_X_WINDOWS */ |
3471 | 3471 |
3472 #ifdef HAVE_WINDOW_SYSTEM | |
3473 /* Defined in xterm.c, nsterm.m, w32term.c */ | |
3474 extern char *x_get_keysym_name (int); | |
3475 #endif /* HAVE_WINDOW_SYSTEM */ | |
3476 | |
3472 #ifdef MSDOS | 3477 #ifdef MSDOS |
3473 /* Defined in msdos.c */ | 3478 /* Defined in msdos.c */ |
3474 EXFUN (Fmsdos_downcase_filename, 1); | 3479 EXFUN (Fmsdos_downcase_filename, 1); |
3475 #endif | 3480 #endif |
3476 | 3481 |