jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-31 13:38:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "hcrypto: avoid key_type redefinition"

Browse Source 
This reverts commit 81487fcf3ae93d2efea6f0935a0493680b5d3d11.

This change didn't receive sufficient review before it was pushed.
It breaks builds on IRIX, and produces kernel modules that don't
load on a number of other Linux-based systems.

A correct fix for the underlying problem (that both Linux and
hcrypto want to use the "struct key_type" identifier) will follow
this patch.

Change-Id: Ib215f9d8adde75180a86f985052c77600a294895
Reviewed-on: http://gerrit.openafs.org/4191
Reviewed-by: Jeffrey Altman <jaltman@openafs.org>
Tested-by: Jeffrey Altman <jaltman@openafs.org>
This commit is contained in:
Simon Wilkinson 2011-03-10 09:43:35 +00:00 committed by Jeffrey Altman
parent 3105c7ff0b
commit 037acc5ac0
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/crypto/hcrypto/kernel/config.h
View File

@ -26,8 +26,7 @@
#include "afs/param.h"
#include "afs/stds.h"
/* struct key_type conflicts with linux, and this includes linux/security.h */
/* #include "afs/sysincludes.h" */
#include "afs/sysincludes.h"
/* Asserting is a mess - we need the RX headers in order to get a definition
* for osi_Assert */