Missing comma.

[p5sagit/p5-mst-13.2.git] / x2p / util.c

diff --git a/x2p/util.c b/x2p/util.c
index e2b8bba..d43a1eb 100644 (file)
--- a/x2p/util.c
+++ b/x2p/util.c
@@ -13,9 +13,7 @@
 #include "INTERN.h"
 #include "util.h"
 
-#ifdef I_STDARG
-#  include <stdarg.h>
-#endif
+#include <stdarg.h>
 #define FLUSH
 
 static char nomem[] = "Out of memory!\n";
@@ -24,7 +22,7 @@ static char nomem[] = "Out of memory!\n";
 
 
 Malloc_t
-safemalloc(size_t size)
+safemalloc(MEM_SIZE size)
 {
     Malloc_t ptr;
 
@@ -48,7 +46,7 @@ safemalloc(size_t size)
 /* paranoid version of realloc */
 
 Malloc_t
-saferealloc(void *where, size_t size)
+saferealloc(Malloc_t where, MEM_SIZE size)
 {
     Malloc_t ptr;
 
@@ -73,7 +71,7 @@ saferealloc(void *where, size_t size)
 /* safe version of free */
 
 Free_t
-safefree(void *where)
+safefree(Malloc_t where)
 {
 #ifdef DEBUGGING
     if (debug & 128)
@@ -178,16 +176,9 @@ growstr(char **strptr, int *curlen, int newlen)
 }
 
 void
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
 croak(char *pat,...)
-#else /* I_STDARG */
-/*VARARGS1*/
-croak(pat,a1,a2,a3,a4)
-    char *pat;
-    int a1,a2,a3,a4;
-#endif /* I_STDARG */
 {
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
+#if defined(HAS_VPRINTF)
     va_list args;
 
     va_start(args, pat);
@@ -199,16 +190,9 @@ croak(pat,a1,a2,a3,a4)
 }
 
 void
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
 fatal(char *pat,...)
-#else /* I_STDARG */
-/*VARARGS1*/
-fatal(pat,a1,a2,a3,a4)
-    char *pat;
-    int a1,a2,a3,a4;
-#endif /* I_STDARG */
 {
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
+#if defined(HAS_VPRINTF)
     va_list args;
 
     va_start(args, pat);
@@ -219,17 +203,13 @@ fatal(pat,a1,a2,a3,a4)
     exit(1);
 }
 
+#if defined(__APPLE_CC__)
+__private_extern__     /* warn() conflicts with libc */
+#endif
 void
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
 warn(char *pat,...)
-#else /* I_STDARG */
-/*VARARGS1*/
-warn(pat,a1,a2,a3,a4)
-    char *pat;
-    int a1,a2,a3,a4;
-#endif /* I_STDARG */
 {
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
+#if defined(HAS_VPRINTF)
     va_list args;
 
     va_start(args, pat);