* src/blake2/blake2.h (BLAKE2_PACKED): Simplify, and port better to older GCC, by using _GL_ATTRIBUTE_PACKED. --- src/blake2/blake2.h | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-)
diff --git a/src/blake2/blake2.h b/src/blake2/blake2.h index 3960bdb2d..dc4672d1d 100644 --- a/src/blake2/blake2.h +++ b/src/blake2/blake2.h @@ -18,18 +18,12 @@ #include <stddef.h> #include <stdint.h> -#ifdef __has_attribute -# if __has_attribute (packed) -# define BLAKE2_PACKED(x) x __attribute__ ((packed)) -# endif -#endif -#if !defined BLAKE2_PACKED && defined _MSC_VER +/* Pack a structure if possible. This might save space, and is not + needed for correctness. */ +#ifdef _MSC_VER # define BLAKE2_PACKED(x) __pragma (pack (push, 1)) x __pragma (pack (pop)) -#endif -#ifndef BLAKE2_PACKED -/* This should be good enough on other platforms. - If it's not good on yours, please file a bug report. */ -# define BLAKE2_PACKED(x) x +#else +# define BLAKE2_PACKED(x) x _GL_ATTRIBUTE_PACKED #endif #if defined(__cplusplus) -- 2.31.1
