From 0d96dc087901f28451b1513e10928fa2bad3841e Mon Sep 17 00:00:00 2001
From: Bart Schaefer <barts@users.sourceforge.net>
Date: Mon, 18 Sep 2000 14:22:48 +0000
Subject: Back out 12814.

---
 Src/compat.c | 74 ------------------------------------------------------------
 Src/system.h | 20 ----------------
 2 files changed, 94 deletions(-)

(limited to 'Src')

diff --git a/Src/compat.c b/Src/compat.c
index 0c7009b5f..8cfb8a3a5 100644
--- a/Src/compat.c
+++ b/Src/compat.c
@@ -407,80 +407,6 @@ zchdir(char *dir)
 #endif
 }
 
-#ifndef HAVE_ASPRINTF
-/**/
-# ifndef USE_VARARGS
-/**/
-mod_export int
-zasprintf(char **strp, const char *format, int arg1, int arg2)
-{
-    char *buf;
-    
-    buf = (char *)zalloc(PATH_MAX);
-
-    snprintf(buf, PATH_MAX, format, arg1, arg2);
-    *strp = buf;
-    return strlen(buf);
-}
-
-/**/
-# else
-
-/**/
-#  ifdef PREFER_STDARG
-
-/**/
-mod_export int
-zasprintf(char **strp, const char *format, ...)
-{
-
-/**/
-#  else
-
-/**/
-#   if __GNUC__ > 1
-/* Doing this the "right way" will effect a broken compat.epro file.      *
- * This kludge should work with gcc2 until a better solution is available */
-
-/**/
-mod_export int
-zasprintf(char **strp, const char *format, __builtin_va_alist_t __builtin_va_alist, __va_ellipsis)
-{
-	
-/**/
-#    else
-#    error varargs prototyping kludge failed
-/**/
-#    endif
-
-/**/
-#  endif
-    va_list arg;
-
-    char *buf;
-    
-    buf = (char *)zalloc(PATH_MAX);
-
-# ifdef PREFER_STDARG
-    va_start(arg, format);
-# else
-    va_start(arg);
-# endif
-
-#ifdef HAVE_VSNPRINTF
-    vsnprintf(buf, PATH_MAX, format, arg);
-#else
-#error You have varargs but no vsnprintf
-#endif
-    va_end (arg);
-    
-    *strp = buf;
-    return strlen(buf);
-}
-/**/
-# endif
-#endif
-
 /*
  * How to print out a 64 bit integer.  This isn't needed (1) if longs
  * are 64 bit, since ordinary %ld will work (2) if we couldn't find a
diff --git a/Src/system.h b/Src/system.h
index 80feebc05..4ba9bf8ab 100644
--- a/Src/system.h
+++ b/Src/system.h
@@ -227,26 +227,6 @@ struct timezone {
 # define zopenmax() ((long) OPEN_MAX)
 #endif
 
-#if defined (__STDC__) && defined (HAVE_STDARG_H)
-# define PREFER_STDARG
-# define USE_VARARGS
-# include <stdarg.h>
-#else
-# ifdef HAVE_VARARGS_H
-#  define PREFER_VARARGS
-#  define USE_VARARGS
-#  include <varargs.h>
-# endif
-#endif
-
-#ifdef HAVE_ASPRINTF
-# ifdef __GNUC__
-# define zasprintf(X,F,A...) asprintf(X,F, ## A)
-# else
-# define zasprintf asprintf
-# endif
-#endif
-
 #ifdef HAVE_FCNTL_H
 # include <fcntl.h>
 #else
-- 
cgit 1.4.1