From: Vsevolod Stakhov Date: Mon, 9 Feb 2015 10:23:07 +0000 (+0000) Subject: Macro ambiguity hell. X-Git-Tag: 0.9.0~737 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=9c825e98d3400de0f5d261415f71ab5b34d1297d;p=rspamd.git Macro ambiguity hell. --- 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 #include -#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];