kevin/libsodium
1
Fork 0
mirror of https://github.com/jedisct1/libsodium.git synced 2024-12-24 04:25:10 -07:00
Code Releases Wiki Activity

Replace __sun and __GNU_C by __SUNPRO_C to simplify logic regarding @jedisct1 comments

Browse Source
This commit is contained in:
unknown 2015-10-22 18:13:34 +02:00
parent 4b63cd1614
commit 0814537aea
2 changed files with 12 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/libsodium/crypto_generichash/blake2/ref/blake2.h
View File

@ -57,14 +57,10 @@ extern "C" {
BLAKE2B_PERSONALBYTES = 16
};
#ifndef __sun
#pragma pack(push, 1)
#ifdef __SUNPRO_C
# pragma pack(1)
#else
# ifndef __GNU_C__
#pragma pack(1)
# else
#pragma pack(push, 1)
# endif
# pragma pack(push, 1)
#endif
typedef struct blake2s_param_
@ -137,14 +133,10 @@ typedef crypto_generichash_blake2b_state blake2b_state;
size_t buflen;
} blake2bp_state;
#ifndef __sun
#pragma pack(pop)
#ifdef __SUNPRO_C
# pragma pack()
#else
# ifndef __GNU_C__
# pragma pack()
# else
# pragma pack(pop)
# endif
# pragma pack(pop)
#endif
// Streaming API

20
src/libsodium/include/sodium/crypto_generichash_blake2b.h
View File

@ -14,14 +14,10 @@
extern "C" {
#endif
#ifndef __sun
#pragma pack(push, 1)
#ifdef __SUNPRO_C
# pragma pack(1)
#else
# ifndef __GNU_C__
#pragma pack(1)
# else
#pragma pack(push, 1)
# endif
# pragma pack(push, 1)
#endif
typedef CRYPTO_ALIGN(64) struct crypto_generichash_blake2b_state {
@ -33,14 +29,10 @@ typedef CRYPTO_ALIGN(64) struct crypto_generichash_blake2b_state {
uint8_t last_node;
} crypto_generichash_blake2b_state;
#ifndef __sun
#pragma pack(pop)
#ifdef __SUNPRO_C
# pragma pack()
#else
# ifndef __GNU_C__
#pragma pack()
# else
#pragma pack(pop)
# endif
# pragma pack(pop)
#endif
#define crypto_generichash_blake2b_BYTES_MIN 16U