From: Ryan Tandy <ryan@nardis.ca>
Date: Sun, 1 Sep 2019 18:53:37 +0000 (-0700)
Subject: ITS#8383 Look for socklen_t in <ws2tcpip.h> too
X-Git-Tag: OPENLDAP_REL_ENG_2_4_50~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6fe9b0c65479363e4f9f03dd85fc81b2940f62df;p=thirdparty%2Fopenldap.git

ITS#8383 Look for socklen_t in <ws2tcpip.h> too

MinGW targets do not have the <sys/socket.h> header. The configure check
would conclude that there is no socklen_t type, resulting in portable.h
containing its own definition of socklen_t, which would later conflict
with the actual definition in <ws2tcpip.h>.

Add <ws2tcpip.h> to the configure check for socklen_t, so that the
defined type is correctly detected.
---

diff --git a/configure.in b/configure.in
index b9cf43515f..37293e6187 100644
--- a/configure.in
+++ b/configure.in
@@ -2259,6 +2259,9 @@ AC_CHECK_TYPES([ptrdiff_t])
 AC_CHECK_TYPE([socklen_t],,, [$ac_includes_default
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
+#endif
+#ifdef HAVE_WINSOCK2
+#include <ws2tcpip.h>
 #endif])
 
 dnl socklen_t-like type in accept(), default socklen_t or int: