diff options
| author | Paul Eggert | 2016-12-01 21:56:49 -0800 |
|---|---|---|
| committer | Paul Eggert | 2016-12-01 21:57:15 -0800 |
| commit | f3fa5d7e229f88e6f83dc24757b33e9b17bf10ae (patch) | |
| tree | 81af303417b41d6d70a71461e2d81434710d1347 /lib/sha1.c | |
| parent | ebb96114d88af64cbb72f42052cb359ba8010aa2 (diff) | |
| download | emacs-f3fa5d7e229f88e6f83dc24757b33e9b17bf10ae.tar.gz emacs-f3fa5d7e229f88e6f83dc24757b33e9b17bf10ae.zip | |
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/sha1.c')
| -rw-r--r-- | lib/sha1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/sha1.c b/lib/sha1.c index 45f1cbefd18..753c0884d8b 100644 --- a/lib/sha1.c +++ b/lib/sha1.c | |||
| @@ -246,7 +246,7 @@ sha1_process_bytes (const void *buffer, size_t len, struct sha1_ctx *ctx) | |||
| 246 | /* Process available complete blocks. */ | 246 | /* Process available complete blocks. */ |
| 247 | if (len >= 64) | 247 | if (len >= 64) |
| 248 | { | 248 | { |
| 249 | #if !_STRING_ARCH_unaligned | 249 | #if !(_STRING_ARCH_unaligned || _STRING_INLINE_unaligned) |
| 250 | # define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0) | 250 | # define UNALIGNED_P(p) ((uintptr_t) (p) % alignof (uint32_t) != 0) |
| 251 | if (UNALIGNED_P (buffer)) | 251 | if (UNALIGNED_P (buffer)) |
| 252 | while (len > 64) | 252 | while (len > 64) |