1 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index b53d9b49a42..353aa100e9c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,5 +1,17 @@
 2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
 
+        * gnutls.c: Use Emacs's memory allocators.
+        Without this change, the gnutls library would invoke malloc etc.
+        directly, which causes problems on non-SYNC_INPUT hosts, and which
+        runs afoul of improving memory_full behavior.
+        (fn_gnutls_global_set_mem_functions): New macro or function pointer.
+        (emacs_gnutls_global_init): Use it to specify xmalloc, xrealloc,
+        xfree instead of the default malloc, realloc, free.
+        (Fgnutls_boot): No need to check for memory allocation failure,
+        since xmalloc does that for us.
+
+2011-05-30  Paul Eggert  <eggert@cs.ucla.edu>
+
         * eval.c (Qdebug): Now static.
         * lisp.h (Qdebug): Remove decl.  This reverts a part of the
         2011-04-26T11:26:05Z!dan.colascione@gmail.com that inadvertently undid part of