]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
missed one on last commit
authorJeff Lenk <jeff@jefflenk.com>
Fri, 31 Jan 2014 15:15:52 +0000 (09:15 -0600)
committerJeff Lenk <jeff@jefflenk.com>
Fri, 31 Jan 2014 15:16:20 +0000 (09:16 -0600)
libs/srtp/crypto/include/datatypes.h

index 12e9ce99b6cfd56c147f6c81f13985ca14a4d3ef..6f18e9ebbf1bbb7b42dfb1086f3b0805933534f4 100644 (file)
@@ -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 */