From eb3e7d7ffe444652fe6f90808f95e08bc99cf5ae Mon Sep 17 00:00:00 2001 From: miod <> Date: Wed, 9 Jul 2014 16:06:14 +0000 Subject: Remove leading underscore from _BYTE_ORDER and _{LITTLE,BIG}_ENDIAN, to be more friendly to systems where the underscore flavours may be defined as empty. Found the hard way be bcook@; joint brainstrom with bcook beck and guenther --- src/lib/libcrypto/whrlpool/wp_block.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/lib/libcrypto/whrlpool/wp_block.c') diff --git a/src/lib/libcrypto/whrlpool/wp_block.c b/src/lib/libcrypto/whrlpool/wp_block.c index 92d834e289..d357e529ca 100644 --- a/src/lib/libcrypto/whrlpool/wp_block.c +++ b/src/lib/libcrypto/whrlpool/wp_block.c @@ -1,4 +1,4 @@ -/* $OpenBSD: wp_block.c,v 1.8 2014/07/08 16:15:20 miod Exp $ */ +/* $OpenBSD: wp_block.c,v 1.9 2014/07/09 16:06:13 miod Exp $ */ /** * The Whirlpool hashing function. * @@ -76,7 +76,7 @@ typedef unsigned long long u64; # define ROTATE(a,n) ({ u64 ret; asm ("rolq %1,%0" \ : "=r"(ret) : "J"(n),"0"(a) : "cc"); ret; }) # elif defined(__ia64) || defined(__ia64__) -# if _BYTE_ORDER == _LITTLE_ENDIAN +# if BYTE_ORDER == LITTLE_ENDIAN # define ROTATE(a,n) ({ u64 ret; asm ("shrp %0=%1,%1,%2" \ : "=r"(ret) : "r"(a),"M"(64-(n))); ret; }) # else @@ -88,7 +88,7 @@ typedef unsigned long long u64; #if defined(OPENSSL_SMALL_FOOTPRINT) # if !defined(ROTATE) -# if _BYTE_ORDER == _LITTLE_ENDIAN /* little-endians have to rotate left */ +# if BYTE_ORDER == LITTLE_ENDIAN /* little-endians have to rotate left */ # define ROTATE(i,n) ((i)<<(n) ^ (i)>>(64-n)) # else /* big-endians have to rotate right */ # define ROTATE(i,n) ((i)>>(n) ^ (i)<<(64-n)) -- cgit v1.2.3-55-g6feb