From 64c59c2b111661bfa28e2ccad9d3b9a7c4cf313a Mon Sep 17 00:00:00 2001 From: Tom Yu Date: Fri, 23 Jun 1995 19:44:33 +0000 Subject: [PATCH] * k5-config.h: remove definition for KRB5_PROVIDE_PROTOTYPES because we've reversed the sense * configure.in: KBR5_PROVIDE_PROTOTYPES -> KRB5_NO_PROTOTYPES; NO_NESTED_PROTOTYPES -> KRB5_NO_NESTED_PROTOTYPES * rsa-md5.h: reverse sense of KRB5_PROVIDE_PROTOTYPES git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@6153 dc483132-0cff-0310-8789-dd5450dbe970 --- src/include/krb5/ChangeLog | 9 +++++++++ src/include/krb5/configure.in | 6 +++--- src/include/krb5/k5-config.h | 1 - src/include/krb5/rsa-md5.h | 2 +- 4 files changed, 13 insertions(+), 5 deletions(-) diff --git a/src/include/krb5/ChangeLog b/src/include/krb5/ChangeLog index 5bb1233c4..5e5dcbc8b 100644 --- a/src/include/krb5/ChangeLog +++ b/src/include/krb5/ChangeLog @@ -1,3 +1,12 @@ +Thu Jun 22 16:11:07 1995 Tom Yu (tlyu@dragons-lair) + + * k5-config.h: remove definition for KRB5_PROVIDE_PROTOTYPES + because we've reversed the sense + + * configure.in: KBR5_PROVIDE_PROTOTYPES -> KRB5_NO_PROTOTYPES; + NO_NESTED_PROTOTYPES -> KRB5_NO_NESTED_PROTOTYPES + + * rsa-md5.h: reverse sense of KRB5_PROVIDE_PROTOTYPES Thu Jun 22 11:52:07 EDT 1995 Paul Park (pjpark@mit.edu) * adm_proto.h - Add prototypes for kadm library profile handling diff --git a/src/include/krb5/configure.in b/src/include/krb5/configure.in index cca698b51..1ecc31200 100644 --- a/src/include/krb5/configure.in +++ b/src/include/krb5/configure.in @@ -60,8 +60,8 @@ AC_CACHE_VAL(krb5_cv_has_prototypes, [int x(double y, int z);], [], krb5_cv_has_prototypes=yes, krb5_cv_has_prototypes=no)]) AC_MSG_RESULT($krb5_cv_has_prototypes) -if test $krb5_cv_has_prototypes = yes; then -AC_DEFINE(KRB5_PROVIDE_PROTOTYPES) +if test $krb5_cv_has_prototypes = no; then +AC_DEFINE(KRB5_NO_PROTOTYPES) fi dnl *never* set NARROW_PROTOTYPES @@ -73,7 +73,7 @@ AC_CACHE_VAL(krb5_cv_struct_prototypes, krb5_cv_struct_prototypes=yes, krb5_cv_struct_prototypes=no)]) AC_MSG_RESULT($krb5_cv_struct_prototypes) if test $krb5_cv_struct_prototypes = no; then -AC_DEFINE(NO_NESTED_PROTOTYPES) +AC_DEFINE(KRB5_NO_NESTED_PROTOTYPES) fi dnl diff --git a/src/include/krb5/k5-config.h b/src/include/krb5/k5-config.h index 244c5ae7f..7c9b66780 100644 --- a/src/include/krb5/k5-config.h +++ b/src/include/krb5/k5-config.h @@ -61,7 +61,6 @@ #define HAS_ANSI_VOLATILE #define HAS_VOID_TYPE -#define KRB5_PROVIDE_PROTOTYPES #define HAVE_STDARG_H #define HAVE_SYS_TYPES_H diff --git a/src/include/krb5/rsa-md5.h b/src/include/krb5/rsa-md5.h index b962830aa..1a831ca0b 100644 --- a/src/include/krb5/rsa-md5.h +++ b/src/include/krb5/rsa-md5.h @@ -48,7 +48,7 @@ typedef struct { unsigned char digest[16]; /* actual digest after MD5Final call */ } MD5_CTX; -#if defined(__STDC__) || defined(KRB5_PROVIDE_PROTOTYPES) || defined(_WINDOWS) +#if (defined(__STDC__) || defined(_WINDOWS)) && !defined(KRB5_NO_PROTOTYPES) extern void MD5Init(MD5_CTX FAR *); extern void MD5Update (MD5_CTX FAR *, unsigned char FAR *, unsigned int); extern void MD5Final (MD5_CTX FAR *); -- 2.26.2