Add explicit cast to (VOID *) on malloc/realloc. Seems to be needed

on AIX which for some reason isn't pulling in the malloc prototype.

diff --git a/alloc.c b/alloc.c
index 8cc5c54affb5dee32f93ac12884464e52208c442..32d61365420a6823e2e3dec98d535a4ff162eb53 100644 (file)
--- a/alloc.c
+++ b/alloc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999-2001 Todd C. Miller <Todd.Miller@courtesan.com>
+ * Copyright (c) 1999-2002 Todd C. Miller <Todd.Miller@courtesan.com>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -58,18 +58,11 @@
 
 #include "sudo.h"
 
-#ifndef STDC_HEADERS
-#if !defined(__GNUC__) && !defined(HAVE_MALLOC_H)
-extern VOID *malloc    __P((size_t));
-#endif /* !__GNUC__ && !HAVE_MALLOC_H */
-#endif /* !STDC_HEADERS */
-
-extern char **Argv;            /* from sudo.c */
-
 #ifndef lint
 static const char rcsid[] = "$Sudo$";
 #endif /* lint */
 
+extern char **Argv;            /* from sudo.c */
 
 /*
  * emalloc() calls the system malloc(3) and exits with an error if
@@ -81,7 +74,7 @@ emalloc(size)
 {
     VOID *ptr;
 
-    if ((ptr = malloc(size)) == NULL) {
+    if ((ptr = (VOID *) malloc(size)) == NULL) {
        (void) fprintf(stderr, "%s: cannot allocate memory!\n", Argv[0]);
        exit(1);
     }
@@ -99,7 +92,8 @@ erealloc(ptr, size)
     size_t size;
 {
 
-    if ((ptr = ptr ? realloc(ptr, size) : malloc(size)) == NULL) {
+    ptr = ptr ? (VOID *) realloc(ptr, size) : (VOID *) malloc(size);
+    if (ptr == NULL) {
        (void) fprintf(stderr, "%s: cannot allocate memory!\n", Argv[0]);
        exit(1);
     }