From: Mat Booth <github@matbooth.co.uk>
Date: Mon, 23 Jul 2012 12:51:03 +0000 (+0100)
Subject: ITS#7332 Changes required to build with Microsoft Visual Studio
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=e6d190c7dec535799c5b531b0f848c249b5080b0;p=openldap

ITS#7332 Changes required to build with Microsoft Visual Studio
---

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 6c1ebcdcea..f99da85e9a 100644
--- 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 be824e4e82..4c4e47b8bb 100644
--- 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 570b296c2e..3510aec93e 100644
--- 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 }
 	};