From: Quanah Gibson-Mount <quanah@openldap.org>
Date: Sat, 31 Oct 2009 01:00:31 +0000 (+0000)
Subject: Fix sock_errset macro: Wrap it in (), return void to match Winsock version.
X-Git-Tag: OPENLDAP_REL_ENG_2_4_20~70
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=2095369411b784ef9994cd5bd93580a02e2e7776;p=openldap

Fix sock_errset macro: Wrap it in (), return void to match Winsock version.
AC_SOCKET_INVALID nitpick: ((unsigned)~0) [needs 2's compl.] -> ((unsigned)-1)
---

diff --git a/include/ac/socket.h b/include/ac/socket.h
index 1f06d0f442..668b03a9f1 100644
--- a/include/ac/socket.h
+++ b/include/ac/socket.h
@@ -82,14 +82,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 ))