Portability changes

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

diff --git a/src/util/et/com_err.c b/src/util/et/com_err.c
index 78b91ce0a35f853cd2afaa09cc826a2d0ea6c59a..c3aa8556d9b37bc3077058122e48607bd9ba1c9c 100644 (file)
--- a/src/util/et/com_err.c
+++ b/src/util/et/com_err.c
@@ -7,26 +7,20 @@
 #include <stdio.h>
 #include "mit-sipb-copyright.h"
 
-/*
- * If we're using gcc, *always* use stdarg. However, there are a small
- * number of native platforms (sun3 and sun4, sunos41) that don't have 
- * stdarg, but only have varargs... they can define VARARGS in the config
- * files, but we'll turn it off here for gcc.
- */
+/* Need <krb5/config.h> for STDARG_PROTOTYPES */
+#include <krb5/krb5.h>
 
-#ifdef __GNUC__
-#undef VARARGS
-#endif
-
-#if defined(__STDC__) && !defined(VARARGS)
+#if __STDC__ || defined(STDARG_PROTOTYPES)
 #include <stdarg.h>
 #else
 #include <varargs.h>
+#define VARARGS
 #endif
 
 #include "error_table.h"
 #include "internal.h"
 
+#ifdef notdef
 /*
  * Protect us from header version (externally visible) of com_err, so
  * we can survive in a <varargs.h> environment.  I think.
@@ -34,6 +28,7 @@
 #define com_err com_err_external
 #include "com_err.h"
 #undef com_err
+#endif
 
 #if ! lint
 static const char rcsid[] =