Fix conflicting ntohll macro on OS X

Change-Id: Iaebafdb228996dace3272998d6dbb365891e3d79

Author: Martin Veith

Capu/include/capu/util/SocketInputStream.h

@@ -28,7 +28,7 @@ namespace capu
 
     inline
     uint64_t 
-    ntohll(uint64_t & value)
+    _ntohll(uint64_t & value)
     {
         int_t checkNumber = 42;
         if(*(char_t*)&checkNumber == 42)
@@ -201,7 +201,7 @@ namespace capu
     IInputStream& SocketInputStream::operator>>(uint64_t& value)
     {
         read(reinterpret_cast<char_t*>(&value), sizeof(uint64_t));
-        value = ntohll(value);
+        value = _ntohll(value);
         return *this;
     }
 

Capu/include/capu/util/SocketOutputStream.h

@@ -25,7 +25,7 @@
 
 namespace capu
 {
-    uint64_t htonll(const uint64_t value);
+    uint64_t _htonll(const uint64_t value);
 
     /* The SocketOutputStream writes data to a given socket*/
     template<uint16_t SNDBUFSIZE = 1450>
@@ -213,7 +213,7 @@ namespace capu
     IOutputStream&
     SocketOutputStream<SNDBUFSIZE>::operator<<( const int64_t value)
     {
-        const int64_t networkOrder = htonll(value);
+        const int64_t networkOrder = _htonll(value);
         return write(&networkOrder, sizeof(int64_t));
     }
 
@@ -381,7 +381,7 @@ namespace capu
 
     inline
     uint64_t 
-    htonll(const uint64_t value)
+    _htonll(const uint64_t value)
     {
         int64_t checkNumber = 42;
         if(*(char_t*)&checkNumber == 42)

Capu_Test/src/util/TcpSocketInputStreamTest.cpp

@@ -63,7 +63,7 @@ namespace capu
         typedef uint64_t VALUE_TYPE;
         static void Send(TcpSocket& socket, const uint64_t& data)
         {
-            uint64_t tmp = htonll(data);
+            uint64_t tmp = _htonll(data);
             SendToSocket(socket, reinterpret_cast<char_t*>(&tmp), sizeof(uint64_t));
         }
     };
@@ -73,7 +73,7 @@ namespace capu
         typedef int64_t VALUE_TYPE;
         static void Send(TcpSocket& socket, const int64_t& data)
         {
-            uint64_t tmp = htonll(static_cast<int64_t>(data));
+            uint64_t tmp = _htonll(static_cast<int64_t>(data));
             SendToSocket(socket, reinterpret_cast<char_t*>(&tmp), sizeof(int64_t));
         }
     };

Capu_Test/src/util/TcpSocketOutputStreamTest.cpp

@@ -86,7 +86,7 @@ namespace capu
         {
             uint64_t tmp;
             receiveFromSocket(reinterpret_cast<char_t*>(&tmp), sizeof(uint64_t));
-            value = ntohll(tmp);
+            value = _ntohll(tmp);
             return *this;
         }
 

Capu_Test/src/util/UdpSocketInputStreamTest.cpp

@@ -58,7 +58,7 @@ namespace capu
         typedef int64_t VALUE_TYPE;
         static void Send(const capu::uint16_t port, UdpSocket& socket, const int64_t& data)
         {
-            int64_t tmp = htonll(data);
+            int64_t tmp = _htonll(data);
             SendToSocket(port, socket, reinterpret_cast<char_t*>(&tmp), sizeof(int64_t));
         }
     };
@@ -68,7 +68,7 @@ namespace capu
         typedef uint64_t VALUE_TYPE;
         static void Send(const capu::uint16_t port, UdpSocket& socket, const uint64_t& data)
         {
-            int64_t tmp = htonll(data);
+            int64_t tmp = _htonll(data);
             SendToSocket(port, socket, reinterpret_cast<char_t*>(&tmp), sizeof(uint64_t));
         }
     };

Capu_Test/src/util/UdpSocketOutputStreamTest.cpp

@@ -81,7 +81,7 @@ namespace capu
         {
             uint64_t tmp;
             receiveFromSocket(reinterpret_cast<char_t*>(&tmp), sizeof(uint64_t));
-            value = ntohll(tmp);
+            value = _ntohll(tmp);
             return *this;
         }