Final round of module changes

[openldap] / include / ac / socket.h

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 5901442749b63edfd60829605a6baffb11180b9d..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
@@ -67,8 +71,11 @@
 #      define tcp_close( s )           closesocket( s );
 #      define ioctl( s, c, a )         ioctlsocket( (s), (c), (a) )
 #      define ioctl_t                          u_long
+#      define AC_SOCKET_INVALID        ((unsigned int) ~0)
 
 #define EWOULDBLOCK WSAEWOULDBLOCK
+#define EINPROGRESS WSAEINPROGRESS
+#define ETIMEDOUT      WSAETIMEDOUT
 
 #elif MACOS
 #      define tcp_close( s )           tcpclose( s )
@@ -92,12 +99,22 @@
 #      define ioctl_t                          int
 #endif
 
+#ifndef AC_SOCKET_INVALID
+#      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 ) \
         ((((l)&0xff)<<24) + (((l)&0xff00)<<8) + \
          (((l)&0xff0000)>>8) + (((l)&0xff000000)>>24))
-#define AC_NTOHL(l) LBER_HTONL(l)
+#define AC_NTOHL(l) AC_HTONL(l)
 
 #elif defined(__alpha) && !defined(VMS)
 /*
@@ -116,5 +133,9 @@
 #define AC_NTOHL( l ) ntohl( l )
 #endif
 
+/* htons()/ntohs() may be broken much like htonl()/ntohl() */
+#define AC_HTONS( s ) htons( s )
+#define AC_NTOHS( s ) ntohs( s )
+
 
 #endif /* _AC_SOCKET_H_ */