changeset 9992:57789763312c

Fix proper win32 checks and use of inline for setsockopt. Reported by Bruno Haible <bruno@clisp.org>.
author Simon Josefsson <simon@josefsson.org>
date Mon, 28 Apr 2008 16:38:34 +0200
parents 7aa7cfaff758
children 4d5ba95a0dec
files ChangeLog lib/sys_socket.in.h m4/sys_socket_h.m4
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-04-28  Simon Josefsson  <simon@josefsson.org>
+
+	* m4/sys_socket_h.m4: Require AC_C_INLINE when necessary.
+	* lib/sys_socket.in.h (setsockopt): Use proper win32 tests (don't
+	trigger for cygwin).
+	Reported by Bruno Haible  <bruno@clisp.org>.
+
 2008-04-28  Bruno Haible  <bruno@clisp.org>
 
 	* doc/posix-functions/strdup.texi: Mention mingw problem.
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -102,7 +102,7 @@
 #  define ESHUTDOWN               WSAESHUTDOWN
 # endif
 
-# if defined _WIN32 || defined __WIN32__
+# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
 #  define setsockopt(a,b,c,d,e) rpl_setsockopt(a,b,c,d,e)
 static inline int
 rpl_setsockopt(int socket, int level, int optname, const void *optval,
--- a/m4/sys_socket_h.m4
+++ b/m4/sys_socket_h.m4
@@ -45,6 +45,7 @@
       HAVE_WINSOCK2_H=0
       HAVE_WS2TCPIP_H=0
     else
+      AC_REQUIRE([AC_C_INLINE])
       HAVE_SYS_SOCKET_H=0
       dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
       dnl the check for those headers unconditional; yet cygwin reports