From 6512a60090c0bcc35742f254b48d7443c7880e3f Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 30 Jun 2005 22:03:11 +0000 Subject: change all Elf32_* usage to ElfW(*) usage since we shouldnt care about the bitsize --- ldso/include/dl-elf.h | 4 ++-- ldso/include/dl-hash.h | 2 +- ldso/include/ldso.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'ldso/include') diff --git a/ldso/include/dl-elf.h b/ldso/include/dl-elf.h index 06b881f21..4382eee42 100644 --- a/ldso/include/dl-elf.h +++ b/ldso/include/dl-elf.h @@ -65,10 +65,10 @@ extern void _dl_protect_relro (struct elf_resolve *l); #define DYNAMIC_SIZE (DT_NUM+OS_NUM+ARCH_NUM) -extern void _dl_parse_dynamic_info(Elf32_Dyn *dpnt, unsigned long dynamic_info[], void *debug_addr, Elf32_Addr load_off); +extern void _dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], void *debug_addr, ElfW(Addr) load_off); static inline __attribute__((always_inline)) -void __dl_parse_dynamic_info(Elf32_Dyn *dpnt, unsigned long dynamic_info[], void *debug_addr, Elf32_Addr load_off) +void __dl_parse_dynamic_info(ElfW(Dyn) *dpnt, unsigned long dynamic_info[], void *debug_addr, ElfW(Addr) load_off) { for (; dpnt->d_tag; dpnt++) { if (dpnt->d_tag < DT_NUM) { diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index dcad7bcee..27177542b 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -44,7 +44,7 @@ struct elf_resolve{ unsigned long dynamic_info[DYNAMIC_SIZE]; unsigned long n_phent; - Elf32_Phdr * ppnt; + ElfW(Phdr) * ppnt; ElfW(Addr) relro_addr; size_t relro_size; diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index 71cdd5ca8..869bcb675 100644 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -76,6 +76,6 @@ extern char *_dl_strdup(const char *string); extern void _dl_dprintf(int, const char *, ...); extern void _dl_get_ready_to_run(struct elf_resolve *tpnt, unsigned long load_addr, - Elf32_auxv_t auxvt[AT_EGID + 1], char **envp, char **argv); + ElfW(auxv_t) auxvt[AT_EGID + 1], char **envp, char **argv); #endif /* _LDSO_H_ */ -- cgit v1.2.3