From: Jim Meyering <jim@meyering.net>
Date: Thu, 28 Nov 2002 09:38:06 +0000 (+0000)
Subject: .
X-Git-Tag: v4.5.4~129
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=80cff991e86f6185679b4ef10cca92b982b7b19e;p=thirdparty%2Fcoreutils.git

.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 688da1b05e..2a4da2e477 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>