1 files changed, 12 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index c2e28251cb0..5649c8819d3 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,15 @@
+2011-04-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Replace two copies of readlink code with single gnulib version.
+        The gnulib version avoids calling malloc in the usual case,
+        and on 64-bit hosts doesn't have some arbitrary 32-bit limits.
+        * fileio.c (Ffile_symlink_p): Use emacs_readlink.
+        * filelock.c (current_lock_owner): Likewise.
+        * lisp.h (READLINK_BUFSIZE, emacs_readlink): New function.
+        * sysdep.c: Include allocator.h, careadlinkat.h.
+        (emacs_no_realloc_allocator): New static constant.
+        (emacs_readlink): New function.
+
 2011-03-31  Juanma Barranquero  <lekktu@gmail.com>
 
         * xdisp.c (redisplay_internal): Fix prototype.