Use the correct #ifdef for Windows

[libs/net.git] / source / net / inet.cpp

diff --git a/source/net/inet.cpp b/source/net/inet.cpp
index 29e24aa7836d6843652da740fb47de576e8db387..f428492f04bb4e7817af30aa4230fb3e59a9e710 100644 (file)
--- a/source/net/inet.cpp
+++ b/source/net/inet.cpp
@@ -1,4 +1,4 @@
-#ifdef WIN32
+#ifdef _WIN32
 #include <winsock2.h>
 #else
 #include <netinet/in.h>
@@ -21,10 +21,8 @@ InetAddr::InetAddr():
 InetAddr::InetAddr(const SysAddr &sa)
 {
        const sockaddr_in &sai = reinterpret_cast<const sockaddr_in &>(sa.addr);
-       addr[0] = sai.sin_addr.s_addr>>24;
-       addr[1] = sai.sin_addr.s_addr>>16;
-       addr[2] = sai.sin_addr.s_addr>>8;
-       addr[3] = sai.sin_addr.s_addr;
+       const char *ptr = reinterpret_cast<const char *>(&sai.sin_addr.s_addr);
+       std::copy(ptr, ptr+4, addr);
        port = ntohs(sai.sin_port);
 }
 
@@ -34,7 +32,8 @@ SockAddr::SysAddr InetAddr::to_sys() const
        sa.size = sizeof(sockaddr_in);
        sockaddr_in &sai = reinterpret_cast<sockaddr_in &>(sa.addr);
        sai.sin_family = AF_INET;
-       sai.sin_addr.s_addr = (addr[0]<<24) | (addr[1]<<16) | (addr[2]<<8) | (addr[3]);
+       char *ptr = reinterpret_cast<char *>(&sai.sin_addr.s_addr);
+       std::copy(addr, addr+4, ptr);
        sai.sin_port = htons(port);
 
        return sa;