From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 25 Sep 2003 22:01:15 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/glibc-2_3_3~163
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55715bfca6b803d78847f51219e8d1d4ff7b4902;p=thirdparty%2Fglibc.git

Update.

2003-09-25  Jakub Jelinek  <jakub@redhat.com>

	* sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: Include
	sysdeps/i386/dl-procinfo.c instead of
	sysdeps/unix/sysv/linux/i386/dl-procinfo.c.
	* sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Avoid using
	#include_next.
---

diff --git a/ChangeLog b/ChangeLog
index f1619f9a906..723a8c582e2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2003-09-25  Jakub Jelinek  <jakub@redhat.com>
+
+	* sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c: Include
+	sysdeps/i386/dl-procinfo.c instead of
+	sysdeps/unix/sysv/linux/i386/dl-procinfo.c.
+	* sysdeps/unix/sysv/linux/i386/dl-procinfo.h: Avoid using
+	#include_next.
+
 2003-09-25  Ulrich Drepper  <drepper@redhat.com>
 
 	* posix/regcomp.c (peek_token): Remove recent changes for anchor
diff --git a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
index de12a1522bb..32eaf084390 100644
--- a/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
+++ b/sysdeps/unix/sysv/linux/i386/dl-procinfo.h
@@ -18,7 +18,7 @@
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
    02111-1307 USA.  */
 
-#include_next <dl-procinfo.h>
+#include <sysdeps/i386/dl-procinfo.h>
 #include <ldsodefs.h>
 
 
diff --git a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
index ec9c4a7eb7f..7e26fecb3a2 100644
--- a/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
+++ b/sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c
@@ -1,5 +1,5 @@
 #ifdef IS_IN_ldconfig
-#include <sysdeps/unix/sysv/linux/i386/dl-procinfo.c>
+#include <sysdeps/i386/dl-procinfo.c>
 #else
 #include <sysdeps/generic/dl-procinfo.c>
 #endif