make stdarg consistent

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

diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c
index fa66a113ca19d23c8bec5f346c06d9364cb46865..7cc68939c213c8b6ce7c83519d4796f8ab5cbcd1 100644 (file)
--- a/src/util/et/com_err.c
+++ b/src/util/et/com_err.c
@@ -7,10 +7,7 @@
 #include <stdio.h>
 #include "mit-sipb-copyright.h"
 
-/* Need <krb5/config.h> for STDARG_PROTOTYPES */
-/* #include <krb5/krb5.h> -- now tested locally*/
-
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef STDARG_PROTOTYPES
 #include <stdarg.h>
 #else
 #include <varargs.h>

diff --git a/src/util/et/com_err.h b/src/util/et/com_err.h
index 7bea01004317f583c2d7e8b31203b3556c2f5e6a..c5a3634bd84a3459afc8faa8d3e4c51f02e3f4c0 100644 (file)
--- a/src/util/et/com_err.h
+++ b/src/util/et/com_err.h
@@ -10,12 +10,17 @@
 
 #ifndef __COM_ERR_H
 
-#ifdef __STDC__
-#ifndef __HIGHC__              /* gives us STDC but not stdarg */
+#ifdef UseStdarg
+#define STDARG_PROTOTYPES
+#endif
+
+#ifdef STDARG_PROTOTYPES
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
+
+#ifdef __STDC__
 /* ANSI C -- use prototypes etc */
 void com_err (const char *, long, const char *, ...);
 char const *error_message (long);

diff --git a/src/util/et/configure.in b/src/util/et/configure.in
index c1b7fc06d35b257e38bc3163a19da342a96d0967..8a40695ff7d3ba4f0d44f83d27d7bae7b8ba58cc 100644 (file)
--- a/src/util/et/configure.in
+++ b/src/util/et/configure.in
@@ -5,4 +5,5 @@ AC_PROG_RANLIB
 HAVE_YYLINENO
 DECLARE_SYS_ERRLIST
 CONFIG_RULES
+CHECK_STDARG
 AC_OUTPUT(Makefile,[EXTRA_RULES])