From 81487fcf3ae93d2efea6f0935a0493680b5d3d11 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Mon, 7 Mar 2011 21:32:53 -0500 Subject: [PATCH] hcrypto: avoid key_type redefinition struct key_type is redefined in crypto.h; originally defined in ./linux/security.h from ../afs/sysincludes.h from hcrypto/kernel/config.h Change-Id: Ib2a4244516c6c0947cb0959bdf9b06fb5a023a28 Reviewed-on: http://gerrit.openafs.org/4178 Tested-by: Derrick Brashear Reviewed-by: Derrick Brashear --- src/crypto/hcrypto/kernel/config.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/crypto/hcrypto/kernel/config.h b/src/crypto/hcrypto/kernel/config.h index 29e9947ab..b757bacb2 100644 --- a/src/crypto/hcrypto/kernel/config.h +++ b/src/crypto/hcrypto/kernel/config.h @@ -26,7 +26,8 @@ #include "afs/param.h" #include "afs/stds.h" -#include "afs/sysincludes.h" +/* struct key_type conflicts with linux, and this includes linux/security.h */ +/* #include "afs/sysincludes.h" */ /* Asserting is a mess - we need the RX headers in order to get a definition * for osi_Assert */ -- 2.39.5