Merge remote branch 'origin/mdb.master' into OPENLDAP_REL_ENG_2_4

[openldap] / include / ac / socket.h

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 3ee751e3a6071eacf6a8bdedd3788a3d1945d860..0f4ea6fc397154ef7970c0600b965494e12a89b7 100644 (file)
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2013 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -62,6 +62,7 @@
 
 #ifdef HAVE_WINSOCK2
 #include <winsock2.h>
+#include <ws2tcpip.h>
 #elif HAVE_WINSOCK
 #include <winsock.h>
 #endif
@@ -82,14 +83,14 @@
 #undef sock_errstr
 #define sock_errno()   errno
 #define sock_errstr(e) STRERROR(e)
-#define sock_errset(e) errno = (e)
+#define sock_errset(e) ((void) (errno = (e)))
 
 #ifdef HAVE_WINSOCK
 #      define tcp_read( s, buf, len )  recv( s, buf, len, 0 )
 #      define tcp_write( s, buf, len ) send( s, buf, len, 0 )
 #      define ioctl( s, c, a )         ioctlsocket( (s), (c), (a) )
 #      define ioctl_t                          u_long
-#      define AC_SOCKET_INVALID        ((unsigned int) ~0)
+#      define AC_SOCKET_INVALID        ((unsigned int) -1)
 
 #      ifdef SD_BOTH
 #              define tcp_close( s )   (shutdown( s, SD_BOTH ), closesocket( s ))
@@ -127,7 +128,7 @@ LBER_F( char * ) ber_pvt_wsa_err2string LDAP_P((int));
 #              define tcp_write( s, buf, len ) netwrite( s, buf, len )
 #      endif /* NCSA */
 
-#elif HAVE_CLOSESOCKET
+#elif defined(HAVE_CLOSESOCKET)
 #      define tcp_close( s )           closesocket( s )
 
 #      ifdef __BEOS__