diff options
author | Mike Frysinger <vapier@gentoo.org> | 2005-08-29 22:45:11 +0000 |
---|---|---|
committer | Mike Frysinger <vapier@gentoo.org> | 2005-08-29 22:45:11 +0000 |
commit | ee375653ed779d95d5467b941371fd81ad6399b7 (patch) | |
tree | 94e6710c0abc65e579cb797c1bac9255af708469 /ldso/include | |
parent | 7377d34eefccb1a9c0c3728495928c5b30fa4f05 (diff) |
some fixes by anemo in Bug 9 to play nicely with 32 or 64 bit hosts
Diffstat (limited to 'ldso/include')
-rw-r--r-- | ldso/include/dl-hash.h | 8 | ||||
-rw-r--r-- | ldso/include/ldso.h | 1 |
2 files changed, 5 insertions, 4 deletions
diff --git a/ldso/include/dl-hash.h b/ldso/include/dl-hash.h index 162c7b425..af6c2b93f 100644 --- a/ldso/include/dl-hash.h +++ b/ldso/include/dl-hash.h @@ -32,15 +32,15 @@ struct elf_resolve{ unsigned short usage_count; unsigned short int init_flag; unsigned long rtld_flags; /* RTLD_GLOBAL, RTLD_NOW etc. */ - Elf32_Word nbucket; - Elf32_Word *elf_buckets; + Elf_Symndx nbucket; + Elf_Symndx *elf_buckets; struct init_fini_list *init_fini; struct init_fini_list *rtld_local; /* keep tack of RTLD_LOCAL libs in same group */ /* * These are only used with ELF style shared libraries */ - Elf32_Word nchain; - Elf32_Word *chains; + Elf_Symndx nchain; + Elf_Symndx *chains; unsigned long dynamic_info[DYNAMIC_SIZE]; unsigned long n_phent; diff --git a/ldso/include/ldso.h b/ldso/include/ldso.h index ceb8aaeb1..300a7292e 100644 --- a/ldso/include/ldso.h +++ b/ldso/include/ldso.h @@ -20,6 +20,7 @@ /* Pull in compiler and arch stuff */ #include <stdlib.h> #include <stdarg.h> +#include <bits/wordsize.h> /* Pull in the arch specific type information */ #include <sys/types.h> /* Pull in the ldso syscalls and string functions */ |