Merge from mainline.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 5ed6826d429..d3a387d1e63 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-04-09  Paul Eggert  <eggert@cs.ucla.edu>
+2011-04-10  Paul Eggert  <eggert@cs.ucla.edu>
 
         * xdisp.c (vmessage): Use a better test for character truncation.
 
@@ -78,6 +78,16 @@
 
         * xdisp.c, lisp.h (message_nolog): Remove; unused.
 
+2011-04-10  Jim Meyering  <meyering@redhat.com>
+
+        use ssize_t and size_t for read- and write-like emacs_gnutls_* functions
+        * gnutls.c (emacs_gnutls_read): Adjust signature to be more read-like:
+        return ssize_t not "int", and use size_t as the buffer length.
+        (emacs_gnutls_write): Likewise, and make the buffer pointer "const".
+        * gnutls.h: Update declarations.
+        * process.c (read_process_output): Use ssize_t, to match.
+        (send_process): Likewise.
+
 2011-04-09  Chong Yidong  <cyd@stupidchicken.com>
 
         * image.c (Fimagemagick_types): Doc fix, and comment cleanup.