ITS#7332 Changes required to build with Microsoft Visual Studio

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 6c1ebcdcea723ea707413f16ae334492c8ee2cdc..f99da85e9adb9c2bc130c5e37e1e5f5e1b96cb4a 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -62,6 +62,7 @@
 
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #elif HAVE_WINSOCK
 #include <winsock.h>
 #endif

diff --git a/libraries/libldap/ldap-int.h b/libraries/libldap/ldap-int.h
index be824e4e825bb5ecafce2bec7932fc8264352b62..4c4e47b8bb6a22d59f48fcc00d39ef7ab3a33b8e 100644 (file)
--- a/libraries/libldap/ldap-int.h
+++ b/libraries/libldap/ldap-int.h
@@ -45,6 +45,9 @@
 
 /* for struct timeval */
 #include <ac/time.h>
+#ifdef _WIN32
+#include <ac/socket.h>
+#endif
 
 #undef TV2MILLISEC
 #define TV2MILLISEC(tv) (((tv)->tv_sec * 1000) + ((tv)->tv_usec/1000))

diff --git a/libraries/libldap/util-int.c b/libraries/libldap/util-int.c
index 570b296c2e6ae449c6db060af91ea7251d51f211..3510aec93e45550513d96b9076c25c1274a7a35b 100644 (file)
--- a/libraries/libldap/util-int.c
+++ b/libraries/libldap/util-int.c
@@ -782,7 +782,9 @@ char *ldap_pvt_gai_strerror (int code) {
                { EAI_NONAME, N_("Name or service not known") },
                { EAI_SERVICE, N_("Servname not supported for ai_socktype") },
                { EAI_SOCKTYPE, N_("ai_socktype not supported") },
+#ifdef EAI_SYSTEM
                { EAI_SYSTEM, N_("System error") },
+#endif
                { 0, NULL }
        };