summaryrefslogtreecommitdiff
path: root/lib/sha256.c
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-12-01 21:56:49 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2016-12-01 21:57:15 -0800
commitf3fa5d7e229f88e6f83dc24757b33e9b17bf10ae (patch)
tree81af303417b41d6d70a71461e2d81434710d1347 /lib/sha256.c
parentebb96114d88af64cbb72f42052cb359ba8010aa2 (diff)
downloademacs-f3fa5d7e229f88e6f83dc24757b33e9b17bf10ae.tar.gz
Merge from gnulib
This incorporates: 2016-11-27 md4,md5,sha*: tune for recent glibc _STRING_INLINE_unaligned 2016-11-21 snippet/c++defs: Simplify _GL_CXXALIAS_* macros. * build-aux/snippet/c++defs.h: * lib/md5.c, lib/sha1.c, lib/sha256.c, lib/sha512.c: Copy from gnulib.
Diffstat (limited to 'lib/sha256.c')
-rw-r--r--lib/sha256.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sha256.c b/lib/sha256.c
index 0be8fd2a858..5251e8d950b 100644
--- a/lib/sha256.c
+++ b/lib/sha256.c
@@ -379,7 +379,7 @@ sha256_process_bytes (const void *buffer, size_t len, struct sha256_ctx *ctx)
/* Process available complete blocks. */
if (len >= 64)
{
-#if !_STRING_ARCH_unaligned
+#if !(_STRING_ARCH_unaligned || _STRING_INLINE_unaligned)
# define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0)
if (UNALIGNED_P (buffer))
while (len > 64)