careadlinkat: rename members to avoid problem

[pspp] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a8d45212ffbdb26fde140f4bfc16852aeefbcf34..c7e4c9280498fb138862c0887b03c777d41a876d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,21 @@
+2011-04-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+       careadlinkat: rename members to avoid problem
+       * lib/allocator.h (struct allocator): Rename members from
+       malloc/realloc to allocate/reallocate, to avoid problems if malloc
+       and realloc are #define'd.  Reported by Eric Blake in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2011-04/msg00091.html>.
+       * lib/careadlinkat.c (careadlinkat): Adjust to renaming.
+
 2011-04-08  Eric Blake  <eblake@redhat.com>
 
+       nonblocking: reduce dependency
+       * tests/test-nonblocking.c: Only test sockets when in use.
+       * modules/nonblocking-tests (Depends-on): Drop socket.
+       (Makefile.am): Link even if sockets are not present.
+       * modules/pipe2-tests (Makefile.am): Likewise.
+       * lib/ioctl.c (ioctl) [WIN32]: Fail if sockets are not also in use.
+
        pipe2: fix O_NONBLOCK support on mingw
        * modules/pipe2 (Depends-on): Add nonblocking.
        * lib/pipe2.c (pipe2) [WIN32]: Add O_NONBLOCK support.