From 64a3ef3c9169a988c74acf57f902a1220f9f5791 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Tue, 3 Oct 2006 12:38:12 +0000 Subject: [PATCH] resolve unused function warning, this probably works better as a macro anyhow. git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@2964 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- 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 31f436f297..17b531beb6 100644 --- a/libs/srtp/crypto/include/datatypes.h +++ b/libs/srtp/crypto/include/datatypes.h @@ -399,16 +399,12 @@ octet_string_set_to_zero(uint8_t *s, int len); # endif # define be32_to_cpu(x) ntohl((x)) -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= (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 */