Final round of module changes

[openldap] / include / ac / socket.h

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 45554cbd5a0208650a81e36733054febd212610d..b85204297674e778a9a2c2d77ea3785b39338df9 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -27,6 +27,10 @@
 
 #include <netinet/in.h>
 
+#ifdef HAVE_NETINET_TCP_H
+#include <netinet/tcp.h>
+#endif
+
 #ifdef HAVE_ARPA_INET_H
 #include <arpa/inet.h>
 #endif
@@ -70,6 +74,8 @@
 #      define AC_SOCKET_INVALID        ((unsigned int) ~0)
 
 #define EWOULDBLOCK WSAEWOULDBLOCK
+#define EINPROGRESS WSAEINPROGRESS
+#define ETIMEDOUT      WSAETIMEDOUT
 
 #elif MACOS
 #      define tcp_close( s )           tcpclose( s )
@@ -97,6 +103,12 @@
 #      define AC_SOCKET_INVALID        (-1)
 #endif
 
+#if !defined( HAVE_INET_ATON ) && !defined( inet_aton )
+#define inet_aton ldap_pvt_inet_aton
+struct in_addr;
+int ldap_pvt_inet_aton LDAP_P(( const char *, struct in_addr * ));
+#endif
+
 #if    defined(__WIN32) && defined(_ALPHA)
 /* NT on Alpha is hosed. */
 #define AC_HTONL( l ) \