* k5-int.h (ss2sin6): New gcc-specific function and alternative macro.

(krb5_crypt_func, krb5_encrypt_helper): Don't use "usage" in argument names.

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

diff --git a/src/include/ChangeLog b/src/include/ChangeLog
index 1710d46a9773268f8d83f96ff5208f07ec738e09..f9b6872f9c6135b8bc92d0a0902a780bb28f085f 100644 (file)
--- a/src/include/ChangeLog
+++ b/src/include/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-03  Ken Raeburn  <raeburn@mit.edu>
+
+       * k5-int.h (ss2sin6): New gcc-specific function and alternative
+       macro.
+       (krb5_crypt_func, krb5_encrypt_helper): Don't use "usage" in
+       argument names.
+
 2001-08-01  Ken Raeburn  <raeburn@mit.edu>
 
        * fake-addrinfo.h (AI_NUMERICHOST): Define as zero if not already

diff --git a/src/include/k5-int.h b/src/include/k5-int.h
index 27d6ec22f29098e8f6f6868e092abc91a8e405a9..4f0edca2bda375b0f3c3b18fb6a98190b4a86f30 100644 (file)
--- a/src/include/k5-int.h
+++ b/src/include/k5-int.h
@@ -225,11 +225,16 @@ static __inline__ struct sockaddr_in *ss2sin (struct sockaddr_storage *ss)
 {
     return (struct sockaddr_in *) ss;
 }
+static __inline__ struct sockaddr_in6 *ss2sin6 (struct sockaddr_storage *ss)
+{
+    return (struct sockaddr_in6 *) ss;
+}
 #else
 #define sa2sin(S)      ((struct sockaddr_in *)(S))
 #define sa2sin6(S)     ((struct sockaddr_in6 *)(S))
 #define ss2sa(S)       ((struct sockaddr *)(S))
 #define ss2sin(S)      ((struct sockaddr_in *)(S))
+#define ss2sin6(S)     ((struct sockaddr_in6 *)(S))
 #endif
 
 #if !defined (socklen)
@@ -628,7 +633,7 @@ typedef void (*krb5_encrypt_length_func) (krb5_const struct krb5_enc_provider *e
 
 typedef krb5_error_code (*krb5_crypt_func) (krb5_const struct krb5_enc_provider *enc,
   krb5_const struct krb5_hash_provider *hash,
-  krb5_const krb5_keyblock *key, krb5_keyusage usage,
+  krb5_const krb5_keyblock *key, krb5_keyusage keyusage,
   krb5_const krb5_data *ivec, 
   krb5_const krb5_data *input, krb5_data *output);
 
@@ -769,7 +774,7 @@ time_t gmt_mktime (struct tm *);
 
 krb5_error_code krb5_encrypt_helper
 (krb5_context context, krb5_const krb5_keyblock *key,
-               krb5_keyusage usage, krb5_const krb5_data *plain,
+               krb5_keyusage keyusage, krb5_const krb5_data *plain,
                krb5_enc_data *cipher);
 
 /*