diff options
| author | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-02-09 10:23:07 +0000 |
|---|---|---|
| committer | Vsevolod Stakhov <vsevolod@highsecure.ru> | 2015-02-09 10:23:07 +0000 |
| commit | 9c825e98d3400de0f5d261415f71ab5b34d1297d (patch) | |
| tree | d88c05da0c9419e10adfdb5a9540a45e07897ea9 /contrib/blake2/blake2.h | |
| parent | f4d4c9b6484379be6aaba9ac2b7bc5c39d8a3dc7 (diff) | |
| download | rspamd-9c825e98d3400de0f5d261415f71ab5b34d1297d.tar.gz rspamd-9c825e98d3400de0f5d261415f71ab5b34d1297d.zip | |
Macro ambiguity hell.
Diffstat (limited to 'contrib/blake2/blake2.h')
| -rw-r--r-- | contrib/blake2/blake2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/contrib/blake2/blake2.h b/contrib/blake2/blake2.h index b0c852284..7011c57f5 100644 --- a/contrib/blake2/blake2.h +++ b/contrib/blake2/blake2.h @@ -17,11 +17,11 @@ #include <stddef.h> #include <stdint.h> -#ifndef ALIGN +#ifndef BLAKE_ALIGN #if defined(_MSC_VER) -# define ALIGN(x) __declspec(align(x)) +# define BLAKE_ALIGN(x) __declspec(align(x)) #else -# define ALIGN(x) __attribute__((aligned(x))) +# define BLAKE_ALIGN(x) __attribute__((aligned(x))) #endif #endif @@ -56,7 +56,7 @@ extern "C" { uint8_t personal[BLAKE2B_PERSONALBYTES]; // 64 } blake2b_param; - ALIGN( 64 ) typedef struct __blake2b_state + BLAKE_ALIGN( 64 ) typedef struct __blake2b_state { uint64_t h[8]; uint64_t t[2]; |