Building in Xcode 6 with iOS8 SDK

[unphased]

Let's look at the first error I'm seeing.

I don't have the old iOS 7 SDK headers handy to do a sanity check, but as you see here, htonll is apparently a macro that results in the breakage of this function definition.

I went ahead and renamed the functions like this:

diff --git a/modelviewer/include/websocketpp/common/network.hpp b/modelviewer/include/websocketpp/common/network.hpp
index 9ba8b53..1b7407c 100644
--- a/modelviewer/include/websocketpp/common/network.hpp
+++ b/modelviewer/include/websocketpp/common/network.hpp
@@ -50,7 +50,7 @@ inline bool is_little_endian() {
 #define TYP_SMLE 1
 #define TYP_BIGE 2

-inline uint64_t htonll(uint64_t src) {
+inline uint64_t _htonll(uint64_t src) {
     static int typ = TYP_INIT;
     unsigned char c;
     union {
@@ -71,8 +71,8 @@ inline uint64_t htonll(uint64_t src) {
     return x.ull;
 }

-inline uint64_t ntohll(uint64_t src) {
-    return htonll(src);
+inline uint64_t _ntohll(uint64_t src) {
+    return _htonll(src);
 }

 } // net
diff --git a/modelviewer/include/websocketpp/frame.hpp b/modelviewer/include/websocketpp/frame.hpp
index 32b50a6..f557e21 100644
--- a/modelviewer/include/websocketpp/frame.hpp
+++ b/modelviewer/include/websocketpp/frame.hpp
@@ -266,7 +266,7 @@ private:
         }

         uint64_converter temp64;
-        temp64.i = lib::net::htonll(payload_size);
+        temp64.i = lib::net::_htonll(payload_size);
         std::copy(temp64.c+payload_offset,temp64.c+8,bytes);

         return 8-payload_offset;
@@ -583,7 +583,7 @@ inline uint16_t get_extended_size(const extended_header &e) {
 inline uint64_t get_jumbo_size(const extended_header &e) {
     uint64_converter temp64;
     std::copy(e.bytes,e.bytes+8,temp64.c);
-    return lib::net::ntohll(temp64.i);
+    return lib::net::_ntohll(temp64.i);
 }

 /// Extract the full payload size field from a WebSocket header

This makes everything work again. However it seems like we should really just use the provided macro implementations so perhaps the right fix is to do a preprocessor check if the macro htonll is already defined?

[zaphoyd]

this has been fixed on the development branch