.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 688da1b05e912c39bc140513634d6ed475862fae..2a4da2e47795c689435e9cef728637be6ac49e63 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,5 +1,10 @@
 2002-11-28  Jim Meyering  <jim@meyering.net>
 
+       Merge some more, in preparation for merge back into libc.
+       * error.c (_): Define only if not already defined.
+       Move definition to follow all #include directives.
+       Include unlocked-io.h only if !_LIBC.
+
        Merge in changes from libc.
        * error.c [_LIBC]: Include <libio/libioP.h>.
        [USE_IN_LIBIO]: Include <libio/iolibio.h>