Date: Wed, 23 May 2018 17:01:28 +0000 (UTC) From: Mark Johnston <markj@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r334105 - head/lib/libmd Message-ID: <201805231701.w4NH1SiM047563@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: markj Date: Wed May 23 17:01:28 2018 New Revision: 334105 URL: https://svnweb.freebsd.org/changeset/base/334105 Log: 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 Modified: head/lib/libmd/Makefile head/lib/libmd/mdXhl.c Modified: head/lib/libmd/Makefile ============================================================================== --- head/lib/libmd/Makefile Wed May 23 17:00:05 2018 (r334104) +++ head/lib/libmd/Makefile Wed May 23 17:01:28 2018 (r334105) @@ -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 Modified: head/lib/libmd/mdXhl.c ============================================================================== --- head/lib/libmd/mdXhl.c Wed May 23 17:00:05 2018 (r334104) +++ head/lib/libmd/mdXhl.c Wed May 23 17:01:28 2018 (r334105) @@ -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) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201805231701.w4NH1SiM047563>