Windows global stuff:

[krb5.git] / src / lib / krb5 / krb / bld_princ.c

diff --git a/src/lib/krb5/krb/bld_princ.c b/src/lib/krb5/krb/bld_princ.c
index 94dbb723d6cb1fe9d27a8b600bbe0e7b21f4010d..d2dc46949e6d1b9abd277d1aa77c8b23c4feac26 100644 (file)
--- a/src/lib/krb5/krb/bld_princ.c
+++ b/src/lib/krb5/krb/bld_princ.c
@@ -24,18 +24,15 @@
  * Build a principal from a list of strings
  */
 
+/* Need <krb5/k5-config.h> for HAVE_STDARG_H */
+#include "k5-int.h"
 
-/* Need <krb5/config.h> for STDARG_PROTOTYPES */
-#include <krb5/krb5.h>
-
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef HAVE_STDARG_H
 #include <stdarg.h>
 #else
 #include <varargs.h>
 #endif
 
-#include <krb5/ext-proto.h>
-
 krb5_error_code
 krb5_build_principal_va(context, princ, rlen, realm, ap)
     krb5_context context;
@@ -100,7 +97,7 @@ krb5_build_principal_va(context, princ, rlen, realm, ap)
 }
 
 krb5_error_code
-#if __STDC__ || defined(STDARG_PROTOTYPES)
+#ifdef HAVE_STDARG_H
 krb5_build_principal(krb5_context context,  krb5_principal * princ, int rlen,
     const char * realm, ...)
 #else
@@ -119,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);