Don't conditionalize prototypes; delete macros supporting it. (Maybe overdone;

don't worry about restoring them when importing new versions of code.)

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

2 files changed, 24 insertions, 20 deletions

diff --git a/src/lib/crypto/dk/ChangeLog b/src/lib/crypto/dk/ChangeLog
index 63cbd02e6..a82f00168 100644
--- a/src/lib/crypto/dk/ChangeLog
+++ b/src/lib/crypto/dk/ChangeLog
@@ -1,3 +1,7 @@
+2001-10-09  Ken Raeburn  <raeburn@mit.edu>
+
+	* dk.h: Make prototypes unconditional.
+
 2001-06-21  Ken Raeburn  <raeburn@mit.edu>
 
 	* derive.c: Include etypes.h.
diff --git a/src/lib/crypto/dk/dk.h b/src/lib/crypto/dk/dk.h
index 57be71db7..8d4c49787 100644
--- a/src/lib/crypto/dk/dk.h
+++ b/src/lib/crypto/dk/dk.h
@@ -27,61 +27,61 @@
 #include "k5-int.h"
 
 void krb5_dk_encrypt_length
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
-		size_t input, size_t *length));
+		size_t input, size_t *length);
 
 krb5_error_code krb5_dk_encrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec,
-		const krb5_data *input, krb5_data *output));
+		const krb5_data *input, krb5_data *output);
 
 krb5_error_code krb5_dk_decrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec, const krb5_data *input,
-		krb5_data *arg_output));
+		krb5_data *arg_output);
 
 krb5_error_code krb5_dk_string_to_key
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc, 
+(const struct krb5_enc_provider *enc, 
 		const krb5_data *string, const krb5_data *salt,
-		krb5_keyblock *key));
+		krb5_keyblock *key);
 
 krb5_error_code krb5_derive_key
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const krb5_keyblock *inkey,
-		krb5_keyblock *outkey, const krb5_data *in_constant));
+		krb5_keyblock *outkey, const krb5_data *in_constant);
 
 krb5_error_code krb5_dk_make_checksum
-KRB5_PROTOTYPE((const struct krb5_hash_provider *hash,
+(const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
-		const krb5_data *input, krb5_data *output));
+		const krb5_data *input, krb5_data *output);
 
 #ifdef ATHENA_DES3_KLUDGE
 void krb5_marc_dk_encrypt_length
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
-		size_t input, size_t *length));
+		size_t input, size_t *length);
 
 krb5_error_code krb5_marc_dk_encrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec,
-		const krb5_data *input, krb5_data *output));
+		const krb5_data *input, krb5_data *output);
 
 krb5_error_code krb5_marc_dk_decrypt
-KRB5_PROTOTYPE((const struct krb5_enc_provider *enc,
+(const struct krb5_enc_provider *enc,
 		const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
 		const krb5_data *ivec, const krb5_data *input,
-		krb5_data *arg_output));
+		krb5_data *arg_output);
 
 krb5_error_code krb5_marc_dk_make_checksum
-KRB5_PROTOTYPE((const struct krb5_hash_provider *hash,
+(const struct krb5_hash_provider *hash,
 		const krb5_keyblock *key, krb5_keyusage usage,
-		const krb5_data *input, krb5_data *output));
+		const krb5_data *input, krb5_data *output);
 #endif /* ATHENA_DES3_KLUDGE */