windows fixes

1 files changed, 5 insertions, 4 deletions

diff --git a/util/sock.h b/util/sock.h
index c41a6bf9cbd..86f9c004be6 100644
--- a/util/sock.h
+++ b/util/sock.h
@@ -49,10 +49,6 @@ namespace mongo {
         char sun_path[108]; // length from unix header
     };
 
-    // Windows doesn't const-qualify src for some reason
-    inline const char* inet_ntop(int af, const void* src, char* dst, socklen_t size){
-        return ::inet_ntop(af, const_cast<void*>(src),dst,size);
-    }
 #else
 
 } // namespace mongo
@@ -158,8 +154,13 @@ namespace mongo {
             char buffer[buflen];
 
             switch (getType()){
+#ifdef _WIN32
+                case AF_INET: return inet_ntoa(as<sockaddr_in>().sin_addr);
+                case AF_INET6: return "No IPv6 support on windows";
+#else
                 case AF_INET:  return inet_ntop(getType(), &as<sockaddr_in>().sin_addr, buffer, addressSize);
                 case AF_INET6: return inet_ntop(getType(), &as<sockaddr_in6>().sin6_addr, buffer, addressSize);
+#endif
                 case AF_UNIX:  return as<sockaddr_un>().sun_path;
                 case AF_UNSPEC: return "(NONE)";
                 default: massert(SOCK_FAMILY_UNKNOWN_ERROR, "unsupported address family", false); return "";