summaryrefslogtreecommitdiff
path: root/lib/ChangeLog
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ChangeLog')
-rw-r--r--lib/ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/lib/ChangeLog b/lib/ChangeLog
index 688da1b05..2a4da2e47 100644
--- 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>