[Emacs-diffs] /srv/bzr/emacs/trunk r103144: Merge: * keyboard.c: conform to C89 pointer rules

[Paul Eggert]

------------------------------------------------------------
revno: 103144 [merge]
committer: Paul Eggert <address@hidden>
branch nick: trunk
timestamp: Sun 2011-02-06 01:04:15 -0800
message:
  Merge: * keyboard.c: conform to C89 pointer rules
modified:
  src/ChangeLog
  src/keyboard.c

=== modified file 'src/ChangeLog'
--- a/src/ChangeLog     2011-02-06 08:51:35 +0000
+++ b/src/ChangeLog     2011-02-06 09:03:25 +0000
@@ -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  <address@hidden>
 

=== modified file 'src/keyboard.c'
--- a/src/keyboard.c    2011-01-30 22:17:44 +0000
+++ b/src/keyboard.c    2011-02-06 09:03:25 +0000
@@ -483,7 +483,7 @@
              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 @@
 
 #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 @@
      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