diff options
| author | Andreas Schwab | 2010-07-06 15:33:34 +0200 |
|---|---|---|
| committer | Andreas Schwab | 2010-07-06 15:33:34 +0200 |
| commit | 7af07b967171736a35e0af8b6ecf6feb072184dc (patch) | |
| tree | cdd258fa78624490df359ee23358685ecb4babf1 /src/ChangeLog | |
| parent | 1725ae554e4d8cd696c9413b63629bf374c362a3 (diff) | |
| download | emacs-7af07b967171736a35e0af8b6ecf6feb072184dc.tar.gz emacs-7af07b967171736a35e0af8b6ecf6feb072184dc.zip | |
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.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index bdde8339b50..bd2aba266cc 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2010-07-06 Andreas Schwab <schwab@linux-m68k.org> | ||
| 2 | |||
| 3 | * xterm.c (x_get_keysym_name): Change type of parameter to int. | ||
| 4 | * lisp.h: Declare x_get_keysym_name. | ||
| 5 | * keyboard.c (modify_event_symbol): Don't declare | ||
| 6 | x_get_keysym_name here. | ||
| 7 | |||
| 1 | 2010-07-06 Dan Nicolaescu <dann@ics.uci.edu> | 8 | 2010-07-06 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 9 | ||
| 3 | * ecrt0.c: Revert conversion to standard C. | 10 | * ecrt0.c: Revert conversion to standard C. |