From 1ff7e0b99a072f3c4d768ec520b3d850c8488a91 Mon Sep 17 00:00:00 2001 From: markj Date: Wed, 23 May 2018 17:01:28 +0000 Subject: [PATCH] Revert r334090. It causes the 32bit compat build of libmd to fail with: libmd/rmd160c.c:86:9: error: 'ripemd160_block' macro redefined #define ripemd160_block ripemd160_block_x86 ^ libmd/ripemd.h:122:9: note: previous definition is here #define ripemd160_block _libmd_ripemd160_block --- lib/libmd/Makefile | 2 +- lib/libmd/mdXhl.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/libmd/Makefile b/lib/libmd/Makefile index 96dfd6dbea76..98c352917dba 100644 --- a/lib/libmd/Makefile +++ b/lib/libmd/Makefile @@ -15,7 +15,7 @@ SRCS= md4c.c md5c.c md4hl.c md5hl.c \ INCS= md4.h md5.h ripemd.h sha.h sha256.h sha384.h sha512.h sha512t.h \ skein.h skein_port.h skein_freebsd.h skein_iv.h -WARNS?= 1 +WARNS?= 0 MAN+= md4.3 md5.3 ripemd.3 sha.3 sha256.3 sha512.3 skein.3 MLINKS+=md4.3 MD4Init.3 md4.3 MD4Update.3 md4.3 MD4Final.3 diff --git a/lib/libmd/mdXhl.c b/lib/libmd/mdXhl.c index 7b990b676e3e..983ea8add989 100644 --- a/lib/libmd/mdXhl.c +++ b/lib/libmd/mdXhl.c @@ -54,7 +54,8 @@ MDXFdChunk(int fd, char *buf, off_t ofs, off_t len) { unsigned char buffer[16*1024]; MDX_CTX ctx; - int readrv; + struct stat stbuf; + int readrv, e; off_t remain; if (len < 0) {