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

PATCH New Hal Rosenstock 1 participant 1 message Sep 20, 2013 InfiniBand

lore

Share & tools

lore

Hal Rosenstock

author

2013-09-20 23:14 UTC #0 lore raw

PATCH 1/1 multicast_resources.h: Guard against duplicated definitions of ntohll/htonll

Signed-off-by Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/[email protected]>

---

src/multicast_resources.h +4 -0

index bc85bae..1bfa043 100644
@@ -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)) )

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html