[uClibc-cvs] CVS update of uClibc/ldso/ldso (ldso.c)

[Erik Andersen]

    Date: Thursday, August 26, 2004 @ 12:38:19
  Author: andersen
    Path: /var/cvs/uClibc/ldso/ldso

Modified: ldso.c (1.115 -> 1.116)

Fixup a couple of warnings


Index: uClibc/ldso/ldso/ldso.c
diff -u uClibc/ldso/ldso/ldso.c:1.115 uClibc/ldso/ldso/ldso.c:1.116
--- uClibc/ldso/ldso/ldso.c:1.115	Thu Aug 26 12:36:23 2004
+++ uClibc/ldso/ldso/ldso.c	Thu Aug 26 12:38:19 2004
@@ -211,7 +211,7 @@
 					 */
 					Elf32_Addr mpa = (ppnt->p_vaddr + app_tpnt->loadaddr) & ~(_dl_pagesize - 1);
 					Elf32_Word mps = ((ppnt->p_vaddr + app_tpnt->loadaddr) - mpa) + ppnt->p_memsz;
-					if(_dl_mprotect(mpa, mps, PROT_READ | PROT_WRITE | PROT_EXEC)) {
+					if(_dl_mprotect((void *)mpa, mps, PROT_READ | PROT_WRITE | PROT_EXEC)) {
 						SEND_STDERR("Couldn't mprotect .dynamic segment to rwx.\n");
 						_dl_exit(0);
 					}
@@ -773,7 +773,7 @@
 	_dl_debug_state();
 
 	/* Find the real malloc function and make ldso functions use that from now on */
-	 _dl_malloc_function = (void (*)(size_t)) (intptr_t) _dl_find_hash("malloc", _dl_symbol_tables, ELF_RTYPE_CLASS_PLT);
+	 _dl_malloc_function = (void* (*)(size_t)) (intptr_t) _dl_find_hash("malloc", _dl_symbol_tables, ELF_RTYPE_CLASS_PLT);
 }
 
 char *_dl_getenv(const char *symbol, char **envp)