2 files changed, 4 insertions, 33 deletions
diff --git a/x2p/util.c b/x2p/util.c
index 0c6f99f795..364dfe94fa 100644
--- 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";
@@ -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);
@@ -220,16 +204,9 @@ fatal(pat,a1,a2,a3,a4)
 }
 
 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);
diff --git a/x2p/util.h b/x2p/util.h
index ff93e8ac7a..aa31bea217 100644
--- a/x2p/util.h
+++ b/x2p/util.h
@@ -28,15 +28,9 @@ void growstr _(( char **strptr, int *curlen, int newlen ));
 char * instr _(( char *big, char *little ));
 char * safecpy _(( char *to, char *from, int len ));
 char * savestr _(( char *str ));
-#if defined(I_STDARG) && defined(HAS_VPRINTF)
 void croak _(( char *pat, ... ));
 void fatal _(( char *pat, ... ));
 void warn  _(( char *pat, ... ));
-#else /* defined(I_STDARG) && defined(HAS_VPRINTF) */
-void croak _(( char *pat, int a1, int a2, int a3, int a4 ));
-void Myfatal ();
-void warn ();
-#endif /* defined(I_STDARG) && defined(HAS_VPRINTF) */
 int prewalk _(( int numit, int level, int node, int *numericptr ));
 
 Malloc_t safemalloc _((MEM_SIZE nbytes));