diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-06 01:03:25 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-06 01:03:25 -0800 |
| commit | 847c082469460ee3d8fb573f70320c6bb096fda2 (patch) | |
| tree | ea5ce53a2bc748a9e6300c803e5063c81c87ea1f | |
| parent | b8dc29e93c73c5b09b5d91c16e5101491a095412 (diff) | |
| download | emacs-847c082469460ee3d8fb573f70320c6bb096fda2.tar.gz | |
* keyboard.c: conform to C89 pointer rules
| -rw-r--r-- | src/ChangeLog | 2 | ||||
| -rw-r--r-- | src/keyboard.c | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index a8790fad31d..ffd669b4ad7 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -15,6 +15,8 @@ * xfns.c (Fx_open_connection, Fx_window_property): Likewise. * bitmaps/gray.xbm (gray_bits): Likewise. * image.c (xbm_read_bitmap_data, xbm_load_image, xbm_load): Likewise. + * keyboard.c (echo_char, MULTI_LETTER_MOD, tty_read_avail_input): + Likewise. 2011-02-05 Paul Eggert <eggert@cs.ucla.edu> diff --git a/src/keyboard.c b/src/keyboard.c index d53321306db..71d6456e57c 100644 --- a/src/keyboard.c +++ b/src/keyboard.c @@ -483,7 +483,7 @@ echo_char (Lisp_Object c) ptr = buffer + offset; } - ptr += copy_text (SDATA (name), ptr, nbytes, + ptr += copy_text (SDATA (name), (unsigned char *) ptr, nbytes, STRING_MULTIBYTE (name), 1); } @@ -6518,7 +6518,7 @@ parse_solitary_modifier (Lisp_Object symbol) #define MULTI_LETTER_MOD(BIT, NAME, LEN) \ if (LEN == SBYTES (name) \ - && ! strncmp (SDATA (name), NAME, LEN)) \ + && ! strncmp (SSDATA (name), NAME, LEN)) \ return BIT; case 'A': @@ -6949,7 +6949,7 @@ tty_read_avail_input (struct terminal *terminal, NREAD is set to the number of chars read. */ do { - nread = emacs_read (fileno (tty->input), cbuf, n_to_read); + nread = emacs_read (fileno (tty->input), (char *) cbuf, n_to_read); /* POSIX infers that processes which are not in the session leader's process group won't get SIGHUP's at logout time. BSDI adheres to this part standard and returns -1 from read (0) with errno==EIO |