aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2003-09-25 22:01:15 +0000
committerUlrich Drepper <drepper@redhat.com>2003-09-25 22:01:15 +0000
commit55715bfca6b803d78847f51219e8d1d4ff7b4902 (patch)
treee97233fdb3219e0cf64b74d15ea6e03f8f19c08a
parenta0788ec48cc3f1357075e8351aa7d62d20c63c15 (diff)
downloadglibc-55715bfca6b803d78847f51219e8d1d4ff7b4902.tar
glibc-55715bfca6b803d78847f51219e8d1d4ff7b4902.tar.gz
glibc-55715bfca6b803d78847f51219e8d1d4ff7b4902.tar.bz2
glibc-55715bfca6b803d78847f51219e8d1d4ff7b4902.zip
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.
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/unix/sysv/linux/i386/dl-procinfo.h2
-rw-r--r--sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index f1619f9a90..723a8c582e 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 de12a1522b..32eaf08439 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 ec9c4a7eb7..7e26fecb3a 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