diff mbox

[perftest] multicast_resources.h: Guard against duplicated definitions of ntohll/htonll

Message ID 523CD6EE.7050106@dev.mellanox.co.il (mailing list archive)
State Rejected
Headers show

Commit Message

Hal Rosenstock Sept. 20, 2013, 11:14 p.m. UTC
Signed-off-by: Hal Rosenstock <hal@mellanox.com>
---
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/src/multicast_resources.h b/src/multicast_resources.h
index bc85bae..1bfa043 100644
--- a/src/multicast_resources.h
+++ b/src/multicast_resources.h
@@ -80,8 +80,12 @@ 
 #define DEF_FLOW_LABLE                 0
 
 // Macro for 64 bit variables to switch to from net
+#ifndef ntohll
 #define ntohll(x) (((uint64_t)(ntohl((int)((x << 32) >> 32))) << 32) | (unsigned int)ntohl(((int)(x >> 32))))
+#endif
+#ifndef htonll
 #define htonll(x) ntohll(x)
+#endif
 
 // generate a bit mask S bits width
 #define MASK32(S)  ( ((uint32_t) ~0L) >> (32-(S)) )