From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 29 Sep 2004 18:00:18 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/fedora-glibc-20040930T0838~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fe62f537bf01399818996ff8c7fa818ef58c664;p=thirdparty%2Fglibc.git

Update.

	Renamed from si_flags due to conflict with si_flags from <elf.h>.
---

diff --git a/ChangeLog b/ChangeLog
index 6fd8932010d..1f1d967ccdd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,7 @@
 2004-09-29  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/ia64/bits/siginfo.h (si_segvflags):
-	Renamed from si_flags due to comflict with si_flags from <elf.h>.
+	Renamed from si_flags due to conflict with si_flags from <elf.h>.
 
 2004-09-28  Ulrich Drepper  <drepper@redhat.com>