summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-08-29 22:45:52 +0000
committerMike Frysinger <vapier@gentoo.org>2005-08-29 22:45:52 +0000
commit97b3ceebfa6f572379b3c70fccd22efbc1fb59bc (patch)
treeb4df7fd2da3c1a4406f92b28e5c7482df6de458d
parentee375653ed779d95d5467b941371fd81ad6399b7 (diff)
downloaduClibc-alpine-97b3ceebfa6f572379b3c70fccd22efbc1fb59bc.tar.bz2
uClibc-alpine-97b3ceebfa6f572379b3c70fccd22efbc1fb59bc.tar.xz
anemo writes in Bug 9: use ElfW(auxv_t) instead of Elf32_auxv_t
-rw-r--r--libc/misc/internals/__uClibc_main.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libc/misc/internals/__uClibc_main.c b/libc/misc/internals/__uClibc_main.c
index 21864ba4f..6f74e39e8 100644
--- a/libc/misc/internals/__uClibc_main.c
+++ b/libc/misc/internals/__uClibc_main.c
@@ -17,6 +17,7 @@
#include <stdlib.h>
#include <string.h>
#include <elf.h>
+#include <link.h>
#include <bits/uClibc_page.h>
#include <paths.h>
#include <unistd.h>
@@ -171,7 +172,7 @@ __uClibc_main(int (*main)(int, char **, char **), int argc,
{
#ifdef __ARCH_HAS_MMU__
unsigned long *aux_dat;
- Elf32_auxv_t auxvt[AT_EGID + 1];
+ ElfW(auxv_t) auxvt[AT_EGID + 1];
#endif
__libc_stack_end = stack_end;
/* We need to initialize uClibc. If we are dynamically linked this
@@ -199,9 +200,9 @@ __uClibc_main(int (*main)(int, char **, char **), int argc,
}
aux_dat++;
while (*aux_dat) {
- Elf32_auxv_t *auxv_entry = (Elf32_auxv_t *) aux_dat;
+ ElfW(auxv_t) *auxv_entry = (ElfW(auxv_t) *) aux_dat;
if (auxv_entry->a_type <= AT_EGID) {
- memcpy(&(auxvt[auxv_entry->a_type]), auxv_entry, sizeof(Elf32_auxv_t));
+ memcpy(&(auxvt[auxv_entry->a_type]), auxv_entry, sizeof(ElfW(auxv_t)));
}
aux_dat += 2;
}