From 46f26bb75e7f17e4b9e871bbe7257aed9e201b9b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernd=20L=C3=B6rwald?= Date: Wed, 22 Oct 2014 23:54:57 +0200 Subject: [PATCH] dep: zmqpp: don't define htonll and ntohll if already #defined is the case with osx: defined in /usr/include/sys/_endian.h --- dep/zmqpp/zmqpp/inet.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/dep/zmqpp/zmqpp/inet.hpp b/dep/zmqpp/zmqpp/inet.hpp index e62828dbf06..e0c3b146e37 100644 --- a/dep/zmqpp/zmqpp/inet.hpp +++ b/dep/zmqpp/zmqpp/inet.hpp @@ -76,10 +76,12 @@ inline uint64_t swap_if_needed(uint64_t const value_to_check) * \param hostlonglong unsigned 64 bit host order integer * \return unsigned 64 bit network order integer */ +#ifndef htonll inline uint64_t htonll(uint64_t const hostlonglong) { return zmqpp::swap_if_needed(hostlonglong); } +#endif /*! * 64 bit version of the ntohs/ntohl @@ -89,10 +91,12 @@ inline uint64_t htonll(uint64_t const hostlonglong) * \param networklonglong unsigned 64 bit network order integer * \return unsigned 64 bit host order integer */ +#ifndef ntohll inline uint64_t ntohll(uint64_t const networklonglong) { return zmqpp::swap_if_needed(networklonglong); } +#endif /*! * floating point version of the htons/htonl