diff options
| author | Bernd Lörwald <bloerwald@googlemail.com> | 2014-10-22 23:54:57 +0200 |
|---|---|---|
| committer | Bernd Lörwald <bloerwald@googlemail.com> | 2014-10-22 23:59:39 +0200 |
| commit | 46f26bb75e7f17e4b9e871bbe7257aed9e201b9b (patch) | |
| tree | 6c1a9e6a7e689063dbcf891c833ed2a097112a8c | |
| parent | 2b6669c544d62751e824f24d96a8228e549e17cf (diff) | |
dep: zmqpp: don't define htonll and ntohll if already #defined
is the case with osx: defined in /usr/include/sys/_endian.h
| -rw-r--r-- | dep/zmqpp/zmqpp/inet.hpp | 4 |
1 files changed, 4 insertions, 0 deletions
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 |