From: Bruno Haible <bruno@clisp.org>
Date: Sat, 27 Nov 2010 14:43:57 +0000 (+0100)
Subject: sys_socket: Fix test whether the functions are declared.
X-Git-Tag: v0.1~3587
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=fded1344e9babb1feddb8f32d9d2422052e4ce73;p=gnulib.git

sys_socket: Fix test whether the functions are declared.

* m4/sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Include <sys/socket.h>,
not <sys/select.h>.
---

diff --git a/ChangeLog b/ChangeLog
index b963f3157..075ba146f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2010-11-26  Bruno Haible  <bruno@clisp.org>
+2010-11-27  Bruno Haible  <bruno@clisp.org>
+
+	sys_socket: Fix test whether the functions are declared.
+	* m4/sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Include <sys/socket.h>,
+	not <sys/select.h>.
+
+2010-11-27  Bruno Haible  <bruno@clisp.org>
 
 	getpass: Make sure to get system declaration on some platforms.
 	* m4/getpass.m4 (gl_FUNC_GETPASS, gl_FUNC_GETPASS_GNU): Require
diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
index f10317e7a..42b9f0e79 100644
--- a/m4/sys_socket_h.m4
+++ b/m4/sys_socket_h.m4
@@ -1,4 +1,4 @@
-# sys_socket_h.m4 serial 18
+# sys_socket_h.m4 serial 19
 dnl Copyright (C) 2005-2010 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -64,10 +64,7 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET],
   gl_WARN_ON_USE_PREPARE([[
 /* Some systems require prerequisite headers.  */
 #include <sys/types.h>
-#if !(defined __GLIBC__ && !defined __UCLIBC__) && HAVE_SYS_TIME_H
-# include <sys/time.h>
-#endif
-#include <sys/select.h>
+#include <sys/socket.h>
     ]], [socket connect accept bind getpeername getsockname getsockopt
     listen recv send recvfrom sendto setsockopt shutdown accept4])
 ])