diff options
| author | Jason Cooper <jason@lakedaemon.net> | 2014-03-24 01:49:02 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2014-04-18 15:47:40 -0700 |
| commit | 8eee37872e843d813485f2da59508412f40b6e6a (patch) | |
| tree | 0f6b80a327b7297c2101e8246fbf82b9bc8c7404 /drivers/staging/skein | |
| parent | da13dfd7e6e792497228cf650289a0d4d5690d38 (diff) | |
| download | talos-op-linux-8eee37872e843d813485f2da59508412f40b6e6a.tar.gz talos-op-linux-8eee37872e843d813485f2da59508412f40b6e6a.zip | |
staging: crypto: skein: remove __cplusplus and an unneeded stddef.h
Signed-off-by: Jason Cooper <jason@lakedaemon.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/staging/skein')
| -rw-r--r-- | drivers/staging/skein/include/skein.h | 11 | ||||
| -rwxr-xr-x | drivers/staging/skein/include/skeinApi.h | 9 | ||||
| -rw-r--r-- | drivers/staging/skein/include/threefishApi.h | 9 |
3 files changed, 0 insertions, 29 deletions
diff --git a/drivers/staging/skein/include/skein.h b/drivers/staging/skein/include/skein.h index f924a688e20a..43e3052525ac 100644 --- a/drivers/staging/skein/include/skein.h +++ b/drivers/staging/skein/include/skein.h @@ -27,13 +27,6 @@ ** 1: return SKEIN_FAIL to flag errors ** ***************************************************************************/ -#ifdef __cplusplus -extern "C" -{ -#endif - -#include <stddef.h> /* get size_t definition */ - typedef unsigned int uint_t; /* native unsigned integer */ typedef uint8_t u08b_t; /* 8-bit unsigned integer */ typedef uint64_t u64b_t; /* 64-bit unsigned integer */ @@ -322,8 +315,4 @@ enum #define SKEIN1024_ROUNDS_TOTAL (8*((((SKEIN_ROUNDS ) + 5) % 10) + 5)) #endif -#ifdef __cplusplus -} -#endif - #endif /* ifndef _SKEIN_H_ */ diff --git a/drivers/staging/skein/include/skeinApi.h b/drivers/staging/skein/include/skeinApi.h index 734d27b79f01..f55c67e81f2b 100755 --- a/drivers/staging/skein/include/skeinApi.h +++ b/drivers/staging/skein/include/skeinApi.h @@ -81,11 +81,6 @@ OTHER DEALINGS IN THE SOFTWARE. #include <linux/types.h> #include <skein.h> -#ifdef __cplusplus -extern "C" -{ -#endif - /** * Which Skein size to use */ @@ -229,10 +224,6 @@ extern "C" */ int skeinFinal(SkeinCtx_t* ctx, uint8_t* hash); -#ifdef __cplusplus -} -#endif - /** * @} */ diff --git a/drivers/staging/skein/include/threefishApi.h b/drivers/staging/skein/include/threefishApi.h index dae270cf71d3..aaecfe822142 100644 --- a/drivers/staging/skein/include/threefishApi.h +++ b/drivers/staging/skein/include/threefishApi.h @@ -33,11 +33,6 @@ #define KeyScheduleConst 0x1BD11BDAA9FC1A22L -#ifdef __cplusplus -extern "C" -{ -#endif - /** * Which Threefish size to use */ @@ -157,10 +152,6 @@ extern "C" void threefishDecrypt256(ThreefishKey_t* keyCtx, uint64_t* input, uint64_t* output); void threefishDecrypt512(ThreefishKey_t* keyCtx, uint64_t* input, uint64_t* output); void threefishDecrypt1024(ThreefishKey_t* keyCtx, uint64_t* input, uint64_t* output); -#ifdef __cplusplus -} -#endif - /** * @} */ |
