Remove varargs.h paths, always use stdarg.h

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@19088 dc483132-0cff-0310-8789-dd5450dbe970

diff --git a/src/appl/bsd/krcp.c b/src/appl/bsd/krcp.c
index b6646f8cb85b946fcefaee7f77909a6b44742d03..a24dde0fb4a8ebafb33b2eefec201acb805ecc44 100644 (file)
--- a/src/appl/bsd/krcp.c
+++ b/src/appl/bsd/krcp.c
@@ -60,11 +60,7 @@ char copyright[] =
 #ifdef HAVE_VFORK_H
 #include <vfork.h>
 #endif
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <sys/wait.h>
 
 #ifdef KERBEROS

diff --git a/src/appl/bsd/krshd.c b/src/appl/bsd/krshd.c
index 7767976c468deeba98a89e7f96eba1e6a00a55c6..5a9baa379785c08e73ba837e4a2fd23a86bc4f64 100644 (file)
--- a/src/appl/bsd/krshd.c
+++ b/src/appl/bsd/krshd.c
@@ -119,12 +119,8 @@ char copyright[] =
 #include <sys/audit.h>
 #include <pwdadj.h>
 #endif
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
-     
+
 #include <signal.h>
 #if !defined(KERBEROS) || !defined(KRB5_KRB4_COMPAT)
 /* Ultrix doesn't protect it vs multiple inclusion, and krb.h includes it */

diff --git a/src/appl/bsd/v4rcp.c b/src/appl/bsd/v4rcp.c
index a339e5b23e88e2b98d51f2e8f9ffa7bf951bd361..13b46233a4c25808ddd29f6fdb6f5ee57815a893 100644 (file)
--- a/src/appl/bsd/v4rcp.c
+++ b/src/appl/bsd/v4rcp.c
@@ -73,11 +73,7 @@ static char sccsid[] = "@(#)rcp.c    5.10 (Berkeley) 9/20/88";
 #include <netdb.h>
 #endif
 #include <errno.h>
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 #include "port-sockets.h"
 

diff --git a/src/appl/telnet/telnet/commands.c b/src/appl/telnet/telnet/commands.c
index f6c0fcdb447e85f09d0d1bb2152ad1530500c25e..57106de7fbd8ac1140077cf6847a2d61e016bd35 100644 (file)
--- a/src/appl/telnet/telnet/commands.c
+++ b/src/appl/telnet/telnet/commands.c
@@ -61,11 +61,7 @@
 #include <netdb.h>
 #include <ctype.h>
 #include <pwd.h>
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 #include <errno.h>
 #ifdef HAVE_VFORK_H
 #include <vfork.h>

diff --git a/src/kadmin/passwd/xm_kpasswd.c b/src/kadmin/passwd/xm_kpasswd.c
index 66976208a112dcf00b99c34f057befb7099c57a8..a55b052c375fc6b0ae8f829577065b42ede120a2 100644 (file)
--- a/src/kadmin/passwd/xm_kpasswd.c
+++ b/src/kadmin/passwd/xm_kpasswd.c
@@ -84,14 +84,7 @@ SetWatchCursor()
  *  Set up a com_err hook, for displaying to a motif scrolling widget.
  */
 
-#if __STDC__
-#      include <stdarg.h>
-#else /* varargs: not STDC or no <stdarg> */
-       /* Non-ANSI, always take <varargs.h> path. */
-#      undef VARARGS
-#      define VARARGS 1
-#      include <varargs.h>
-#endif /* varargs */
+#include <stdarg.h>
 
 static void
 #ifdef __STDC__

diff --git a/src/lib/kadm5/logger.c b/src/lib/kadm5/logger.c
index e9c7bfd496671afceae6c782b327455fd9f5a688..212034bb9592d48a1dfef4d1c58f8494d11d25d6 100644 (file)
--- a/src/lib/kadm5/logger.c
+++ b/src/lib/kadm5/logger.c
@@ -39,11 +39,7 @@
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif /* HAVE_SYSLOG_H */
-#ifdef HAVE_STDARG_H
 #include <stdarg.h>
-#else  /* HAVE_STDARG_H */
-#include <varargs.h>
-#endif /* HAVE_STDARG_H */
 
 #define        KRB5_KLOG_MAX_ERRMSG_SIZE       1024
 #ifndef        MAXHOSTNAMELEN

diff --git a/src/plugins/kdb/db2/libdb2/test/dbtest.c b/src/plugins/kdb/db2/libdb2/test/dbtest.c
index 10a89a6fad1fe90e94b68d1c25d6975fdc46e52c..d479f196773f486488c71ee1302b4952261c74ce 100644 (file)
--- a/src/plugins/kdb/db2/libdb2/test/dbtest.c
+++ b/src/plugins/kdb/db2/libdb2/test/dbtest.c
@@ -738,27 +738,13 @@ usage()
        exit(1);
 }
 
-#ifdef __STDC__
 #include <stdarg.h>
-#else
-#include <varargs.h>
-#endif
 
 void
-#ifdef __STDC__
 err(const char *fmt, ...)
-#else
-err(fmt, va_alist)
-       char *fmt;
-        va_dcl
-#endif
 {
        va_list ap;
-#ifdef __STDC__
        va_start(ap, fmt);
-#else
-       va_start(ap);
-#endif
        (void)fprintf(stderr, "dbtest: ");
        (void)vfprintf(stderr, fmt, ap);
        va_end(ap);