3 files changed, 13 insertions, 8 deletions
diff --git a/src/lib/krb5/krb/ChangeLog b/src/lib/krb5/krb/ChangeLog
index 0bd337cbf..cf426c660 100644
--- a/src/lib/krb5/krb/ChangeLog
+++ b/src/lib/krb5/krb/ChangeLog
@@ -1,3 +1,8 @@
+Sat Mar 18 18:58:02 1995  John Gilmore  (gnu at toad.com)
+
+	* bld_pr_ext.c, bld_princ.c:  Replace STDARG_PROTOTYPES with
+	HAVE_STDARG_H for consistency.
+
 Fri Mar 17 19:48:07 1995  John Gilmore  (gnu at toad.com)
 
 	* Makefile.in (check-mac):  Add.
diff --git a/src/lib/krb5/krb/bld_pr_ext.c b/src/lib/krb5/krb/bld_pr_ext.c
index 1eb4f8bc8..85c62c509 100644
--- a/src/lib/krb5/krb/bld_pr_ext.c
+++ b/src/lib/krb5/krb/bld_pr_ext.c
@@ -26,14 +26,14 @@
 
 #include "k5-int.h"
 
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 
 krb5_error_code INTERFACE_C
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef HAVE_STDARG_H
 krb5_build_principal_ext(krb5_context context,  krb5_principal * princ, int rlen, const char * realm, ...)
 #else
 krb5_build_principal_ext(context, princ, rlen, realm, va_alist)
@@ -51,7 +51,7 @@ krb5_build_principal_ext(context, princ, rlen, realm, va_alist)
     krb5_data *princ_data;
     krb5_principal princ_ret;
 
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef HAVE_STDARG_H
     va_start(ap, realm);
 #else
     va_start(ap);
@@ -88,7 +88,7 @@ krb5_build_principal_ext(context, princ, rlen, realm, va_alist)
     tmpdata[rlen] = 0;
 
     /* process rest of components */
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef HAVE_STDARG_H
     va_start(ap, realm);
 #else
     va_start(ap);
diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
index 6d1048e7b..289a0bf3a 100644
--- a/src/lib/krb5/krb/bld_princ.c
+++ b/src/lib/krb5/krb/bld_princ.c
@@ -24,10 +24,10 @@
  * Build a principal from a list of strings
  */
 
-/* Need <krb5/config.h> for STDARG_PROTOTYPES */
+/* Need <krb5/k5-config.h> for HAVE_STDARG_H */
 #include "k5-int.h"
 
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #else
 #include <varargs.h>
@@ -97,7 +97,7 @@ krb5_build_principal_va(context, princ, rlen, realm, ap)
 }
 
 krb5_error_code INTERFACE_C
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef HAVE_STDARG_H
 krb5_build_principal(krb5_context context,  krb5_principal * princ, int rlen,
     const char * realm, ...)
 #else
@@ -116,7 +116,7 @@ krb5_build_principal(context, princ, rlen, realm, va_alist)
     if (!pr_ret)
 	return ENOMEM;
 
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef HAVE_STDARG_H
     va_start(ap, realm);
 #else
     va_start(ap);