From: John Carr <jfc@mit.edu>
Date: Wed, 29 May 1991 07:02:16 +0000 (+0000)
Subject: Force use of ANSI stdarg if .cf file defines UseStdarg
X-Git-Tag: krb5-1.0-beta1~49
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=d08bc1b97eb687862c54327c46c4b7a4afe691c7;p=krb5.git

Force use of ANSI stdarg if .cf file defines UseStdarg

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

diff --git a/src/include/krb5/base-defs.h b/src/include/krb5/base-defs.h
index abb490ee7..b65b0703c 100644
--- a/src/include/krb5/base-defs.h
+++ b/src/include/krb5/base-defs.h
@@ -59,6 +59,9 @@ typedef char * krb5_const_pointer;
 
 #if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES)
 #define PROTOTYPE(x) x
+#if defined(__STDC__) || defined(STDARG_PROTOTYPES)
+#define	STDARG_P(x) x
+#endif
 #ifdef NARROW_PROTOTYPES
 #define DECLARG(type, val) type val
 #define OLDDECLARG(type, val)
diff --git a/src/include/krb5/func-proto.h b/src/include/krb5/func-proto.h
index fa5682bec..3beda17a7 100644
--- a/src/include/krb5/func-proto.h
+++ b/src/include/krb5/func-proto.h
@@ -159,9 +159,9 @@ krb5_error_code krb5_generate_seq_number
 krb5_error_code krb5_get_server_rcache
     PROTOTYPE((const char *, krb5_rcache *));
 krb5_error_code krb5_build_principal_ext
-    PROTOTYPE((krb5_principal *, int, const char *, ...));
+    STDARG_P((krb5_principal *, int, const char *, ...));
 krb5_error_code krb5_build_principal
-    PROTOTYPE((krb5_principal *, int, const char *, ...));
+    STDARG_P((krb5_principal *, int, const char *, ...));
 #ifdef va_start
 /* XXX depending on varargs include file defining va_start... */
 krb5_error_code krb5_build_principal_va
diff --git a/src/include/krb5/stock/config.h b/src/include/krb5/stock/config.h
index ff3586895..47aa2b5b3 100644
--- a/src/include/krb5/stock/config.h
+++ b/src/include/krb5/stock/config.h
@@ -58,6 +58,10 @@ typedef int krb5_sigtype;
 #define NARROW_PROTOTYPES
 #endif
 
+#ifdef UseStdarg
+#define	STDARG_PROTOTYPES
+#endif
+
 #ifdef Bitsize32
 #ifdef Bitsize64
  error: only one of BitsizeNN, please.