From 74543500628748784594d5248435efe12a071bb5 Mon Sep 17 00:00:00 2001 From: Jeff Lenk Date: Fri, 31 Jan 2014 09:15:52 -0600 Subject: [PATCH] missed one on last commit --- libs/srtp/crypto/include/datatypes.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/libs/srtp/crypto/include/datatypes.h b/libs/srtp/crypto/include/datatypes.h index 12e9ce99b6..6f18e9ebbf 100644 --- a/libs/srtp/crypto/include/datatypes.h +++ b/libs/srtp/crypto/include/datatypes.h @@ -409,16 +409,12 @@ static inline uint32_t be32_to_cpu(uint32_t v) { # define be32_to_cpu(x) ntohl((x)) # endif /* HAVE_X86 */ -static inline uint64_t be64_to_cpu(uint64_t v) { # ifdef NO_64BIT_MATH /* use the make64 functions to do 64-bit math */ - v = make64(htonl(low32(v)),htonl(high32(v))); +# define be64_to_cpu(v) (make64(htonl(low32(v)),htonl(high32(v)))) # else - /* use the native 64-bit math */ - v= (uint64_t)((be32_to_cpu((uint32_t)(v >> 32))) | (((uint64_t)be32_to_cpu((uint32_t)v)) << 32)); +# define be64_to_cpu(v) ((ntohl((uint32_t)(v >> 32))) | (((uint64_t)ntohl((uint32_t)v)) << 32)) # endif - return v; -} #endif /* ! SRTP_KERNEL_LINUX */