diff options
| author | Dan Nicolaescu | 2005-09-30 22:38:16 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2005-09-30 22:38:16 +0000 |
| commit | fa8459a34e076cacde3b7c259af9b5dd84b60802 (patch) | |
| tree | b3d68a9fe6cdfe631bcecb42b30b087aa566e942 /src/xterm.c | |
| parent | b17f937955a92bd8416821ec847d859bc9c3de85 (diff) | |
| download | emacs-fa8459a34e076cacde3b7c259af9b5dd84b60802.tar.gz emacs-fa8459a34e076cacde3b7c259af9b5dd84b60802.zip | |
* image.c (slurp_file, xbm_read_bitmap_data): Cast to the correct
type.
* xterm.c (handle_one_xevent, handle_one_xevent): Likewise.
* unexelf.c (fatal): Fix prototype.
* term.c (fatal): Implement using varargs.
* regex.c (re_char): Move typedef ...
* regex.h (re_char): ... here.
(re_iswctype, re_wctype, re_set_whitespace_regexp): New
prototypes.
* emacs.c (malloc_set_state): Fix return type.
(endif): Fix type.
* lisp.h (fatal): Add argument types.
* dispextern.h (fatal): Delete prototype.
* systime.h: (make_time): Prototype moved from ...
* editfns.c (make_time): ... here.
* editfns.c: Move systime.h include after lisp.h.
* dired.c:
* xsmfns.c:
* process.c: Likewise.
* alloc.c (old_malloc_hook, old_realloc_hook, old_realloc_hook):
Add parameter types.
(__malloc_hook, __realloc_hook, __free_hook): Fix prototypes.
(emacs_blocked_free): Change definition to match __free_hook.
(emacs_blocked_malloc): Change definition to match __malloc_hook.
(emacs_blocked_realloc): Change definition to match
__realloc_hook.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/xterm.c b/src/xterm.c index 5bd38550f67..1234694de4a 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -6231,7 +6231,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) | |||
| 6231 | if (status_return == XBufferOverflow) | 6231 | if (status_return == XBufferOverflow) |
| 6232 | { | 6232 | { |
| 6233 | copy_bufsiz = nbytes + 1; | 6233 | copy_bufsiz = nbytes + 1; |
| 6234 | copy_bufptr = (char *) alloca (copy_bufsiz); | 6234 | copy_bufptr = (unsigned char *) alloca (copy_bufsiz); |
| 6235 | nbytes = XmbLookupString (FRAME_XIC (f), | 6235 | nbytes = XmbLookupString (FRAME_XIC (f), |
| 6236 | &event.xkey, copy_bufptr, | 6236 | &event.xkey, copy_bufptr, |
| 6237 | copy_bufsiz, &keysym, | 6237 | copy_bufsiz, &keysym, |
| @@ -6249,7 +6249,7 @@ handle_one_xevent (dpyinfo, eventp, finish, hold_quit) | |||
| 6249 | if (status_return == XBufferOverflow) | 6249 | if (status_return == XBufferOverflow) |
| 6250 | { | 6250 | { |
| 6251 | copy_bufsiz = nbytes + 1; | 6251 | copy_bufsiz = nbytes + 1; |
| 6252 | copy_bufptr = (char *) alloca (copy_bufsiz); | 6252 | copy_bufptr = (unsigned char *) alloca (copy_bufsiz); |
| 6253 | nbytes = Xutf8LookupString (FRAME_XIC (f), | 6253 | nbytes = Xutf8LookupString (FRAME_XIC (f), |
| 6254 | &event.xkey, | 6254 | &event.xkey, |
| 6255 | copy_bufptr, | 6255 | copy_bufptr, |