aboutsummaryrefslogtreecommitdiff
path: root/elf
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-12-31 18:24:24 +0000
committerAndreas Jaeger <aj@suse.de>2000-12-31 18:24:24 +0000
commit72f70279f4fa34d123ec234c7295059ce15fb8ac (patch)
tree2cb6d0e24ea5cf577c3d5415d5dab684189dc891 /elf
parent9346aad7c42ea476fd7e4c1b5f5754df2b67a7cc (diff)
downloadglibc-72f70279f4fa34d123ec234c7295059ce15fb8ac.tar
glibc-72f70279f4fa34d123ec234c7295059ce15fb8ac.tar.gz
glibc-72f70279f4fa34d123ec234c7295059ce15fb8ac.tar.bz2
glibc-72f70279f4fa34d123ec234c7295059ce15fb8ac.zip
Update.
* sysdeps/unix/sysv/linux/init-first.c: Include <libc-internals.h> for prototypes, remove redundant prototypes. * gmon/gmon.c: Likewise. * sysdeps/unix/i386/i586/clock_getres.c: Likewise. * sysdeps/unix/i386/i586/clock_gettime.c: Likewise. * sysdeps/generic/enbl-secure.c: Include <libc-internals.h> for prototypes. * elf/soinit.c: Likewise. * sysdeps/generic/prof-freq.c: Likewise. * sysdeps/mach/hurd/profil.c: Likewise. * debug/noophooks.c: Likewise. * debug/pcprofile.c: Likewise. * sysdeps/unix/sysv/linux/i386/get_clockfreq.c: Likewise. * sysdeps/generic/get_clockfreq.c: Likewise. * locale/localeinfo.h: Add internal prototypes. * elf/rtld.c (dl_main): Fix prototype.
Diffstat (limited to 'elf')
-rw-r--r--elf/rtld.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/elf/rtld.c b/elf/rtld.c
index 5c794d9a75..ecc93859c5 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -119,7 +119,7 @@ int _dl_starting_up;
static void dl_main (const ElfW(Phdr) *phdr,
- ElfW(Half) phent,
+ ElfW(Word) phnum,
ElfW(Addr) *user_entry);
struct link_map _dl_rtld_map;
@@ -371,7 +371,7 @@ static int version_info; /* Nonzero if information about
static void
dl_main (const ElfW(Phdr) *phdr,
- ElfW(Half) phent,
+ ElfW(Word) phnum,
ElfW(Addr) *user_entry)
{
const ElfW(Phdr) *ph;
@@ -513,7 +513,7 @@ of this helper program; chances are you did not intend to run this program.\n\
}
phdr = _dl_loaded->l_phdr;
- phent = _dl_loaded->l_phnum;
+ phnum = _dl_loaded->l_phnum;
/* We overwrite here a pointer to a malloc()ed string. But since
the malloc() implementation used at this point is the dummy
implementations which has no real free() function it does not
@@ -529,7 +529,7 @@ of this helper program; chances are you did not intend to run this program.\n\
if (_dl_loaded == NULL)
_dl_sysdep_fatal ("cannot allocate memory for link map\n", NULL);
_dl_loaded->l_phdr = phdr;
- _dl_loaded->l_phnum = phent;
+ _dl_loaded->l_phnum = phnum;
_dl_loaded->l_entry = *user_entry;
/* At this point we are in a bit of trouble. We would have to
@@ -557,7 +557,7 @@ of this helper program; chances are you did not intend to run this program.\n\
_dl_loaded->l_map_start = ~0;
/* Scan the program header table for the dynamic section. */
- for (ph = phdr; ph < &phdr[phent]; ++ph)
+ for (ph = phdr; ph < &phdr[phnum]; ++ph)
switch (ph->p_type)
{
case PT_PHDR: