From 57bc6aee44da919a080f8f6ca1e5561f24df9f92 Mon Sep 17 00:00:00 2001 From: Simon Wilkinson Date: Thu, 10 Mar 2011 10:41:57 +0000 Subject: [PATCH] hcrypto: don't redefine key_type Linux's keyring code uses "struct key_type", which is also used internally by the hcrypto code. As, on some Linux variants, afs/sysincludes.h ends up including the keyring definitions, we need to rename our internal key_type definition to something that doesn't clash. Change-Id: Ibfb968db0db3e80d877881fc6da4b34428ee382f Reviewed-on: http://gerrit.openafs.org/4192 Tested-by: BuildBot Tested-by: Simon Wilkinson Reviewed-by: Derrick Brashear --- src/crypto/hcrypto/kernel/config.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/crypto/hcrypto/kernel/config.h b/src/crypto/hcrypto/kernel/config.h index 29e9947..6959ce1 100644 --- a/src/crypto/hcrypto/kernel/config.h +++ b/src/crypto/hcrypto/kernel/config.h @@ -39,6 +39,10 @@ #define inline #endif +/* Both Linux and hcrypto want to use 'struct key_type', so we rename our + * local version */ +#define key_type hc_key_type + /* We need wrappers for the various memory management functions */ #define calloc _afscrypto_calloc void * _afscrypto_calloc(int, size_t); -- 1.9.4