# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1092264471 0
# Node ID 384320e1f0e379f07c49f8126f75089647429cfd
# Parent  83074d3a5d316373d00399f7fc944161e82667db
Merge from coreutils.

diff --git a/lib/ChangeLog b/lib/ChangeLog
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,21 @@
+2004-08-11  Paul Eggert  <eggert@cs.ucla.edu>
+
+	Merge from coreutils.
+	
+	* fnmatch.c (WIDE_CHAR_SUPPORT): Don't set to 1 if missing
+	wmemchr or wmemcpy.  Problem reported by Robert Dahlem
+	for Reliant Unix 5.43.
+
+	* obstack.c: Include <inttypes.h> and <stdint.h> if available.
+	(union fooround): Use uintmax_t, not long int.
+	The rest is a merge from libc:
+	[defined _LIBC]: Include <shlib-compat.h>.
+	(_obstack) [defined _LIBC]: Remove after 2.3.4.
+
+	* settime.c (settime): Recode to avoid warning with Sun Forte C 6U2.
+
+	* strverscmp.c: Convert to UTF-8.
+
 2004-08-09  Paul Eggert  <eggert@cs.ucla.edu>
 
 	* obstack.h (obstack_empty_p):