svn commit: trunk/uClibc/libc/misc/internals

vapier at uclibc.org vapier at uclibc.org
Mon Aug 29 22:45:54 UTC 2005


Author: vapier
Date: 2005-08-29 15:45:52 -0700 (Mon, 29 Aug 2005)
New Revision: 11280

Log:
anemo writes in Bug 9: use ElfW(auxv_t) instead of Elf32_auxv_t

Modified:
   trunk/uClibc/libc/misc/internals/__uClibc_main.c


Changeset:
Modified: trunk/uClibc/libc/misc/internals/__uClibc_main.c
===================================================================
--- trunk/uClibc/libc/misc/internals/__uClibc_main.c	2005-08-29 22:45:11 UTC (rev 11279)
+++ trunk/uClibc/libc/misc/internals/__uClibc_main.c	2005-08-29 22:45:52 UTC (rev 11280)
@@ -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 @@
 {
 #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 @@
     }
     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;
     }




More information about the uClibc-cvs mailing list