From 55715bfca6b803d78847f51219e8d1d4ff7b4902 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Thu, 25 Sep 2003 22:01:15 +0000 Subject: [PATCH] Update. 2003-09-25 Jakub Jelinek * 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. --- ChangeLog | 8 ++++++++ sysdeps/unix/sysv/linux/i386/dl-procinfo.h | 2 +- sysdeps/unix/sysv/linux/x86_64/dl-procinfo.c | 2 +- 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 + + * 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 * 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 +#include #include 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 +#include #else #include #endif