From 80cff991e86f6185679b4ef10cca92b982b7b19e Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Thu, 28 Nov 2002 09:38:06 +0000
Subject: .

---
 lib/ChangeLog | 5 +++++
 1 file changed, 5 insertions(+)

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>
-- 
cgit v1.2.3-70-g09d2