Mercurial > hg > octave-lojdl > gnulib-hg
changeset 13900:b3c2041856e7
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>.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 27 Nov 2010 15:43:57 +0100 |
| parents | e28478fcd1f9 |
| children | fd6b35de1160 |
| files | ChangeLog m4/sys_socket_h.m4 |
| diffstat | 2 files changed, 9 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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 @@ 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]) ])