diff options
author | Ludovic Courtès <ludo@gnu.org> | 2010-05-29 23:58:12 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2010-05-29 23:58:12 +0200 |
commit | a927b6c1d885162c8c3068a74c07840c5bb52162 (patch) | |
tree | 37b08eaeeb45e1023e0aeb0726bf30ef67b233fb /lib/sys_socket.in.h | |
parent | 9c17af407008aae5812d8c3e058c54d04a59c8d6 (diff) | |
download | guile-a927b6c1d885162c8c3068a74c07840c5bb52162.tar.gz |
Update Gnulib to v0.0-3955-g8ab5996.
Diffstat (limited to 'lib/sys_socket.in.h')
-rw-r--r-- | lib/sys_socket.in.h | 35 |
1 files changed, 25 insertions, 10 deletions
diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index f54d757c3..e62a8d061 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -23,6 +23,10 @@ It is intended to provide definitions and prototypes needed by an application. */ +#if __GNUC__ >= 3 +@PRAGMA_SYSTEM_HEADER@ +#endif + #if defined _GL_ALREADY_INCLUDING_SYS_SOCKET_H /* Special invocation convention: - On Cygwin 1.5.x we have a sequence of nested includes @@ -41,10 +45,6 @@ # define _GL_ALREADY_INCLUDING_SYS_SOCKET_H -# if __GNUC__ >= 3 -@PRAGMA_SYSTEM_HEADER@ -# endif - /* On many platforms, <sys/socket.h> assumes prior inclusion of <sys/types.h>. */ # include <sys/types.h> @@ -183,13 +183,23 @@ rpl_fd_isset (SOCKET fd, fd_set * set) /* Wrap everything else to use libc file descriptors for sockets. */ #if @HAVE_WINSOCK2_H@ && !defined _GL_UNISTD_H -# undef close -# define close close_used_without_including_unistd_h +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef close +# define close close_used_without_including_unistd_h +# else + _GL_WARN_ON_USE (close, + "close() used without including <unistd.h>"); +# endif #endif #if @HAVE_WINSOCK2_H@ && !defined _GL_UNISTD_H -# undef gethostname -# define gethostname gethostname_used_without_including_unistd_h +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef gethostname +# define gethostname gethostname_used_without_including_unistd_h +# else + _GL_WARN_ON_USE (gethostname, + "gethostname() used without including <unistd.h>"); +# endif #endif #if @GNULIB_SOCKET@ @@ -571,8 +581,13 @@ _GL_WARN_ON_USE (shutdown, "shutdown is not always POSIX compliant - " #endif #if @HAVE_WINSOCK2_H@ -# undef select -# define select select_used_without_including_sys_select_h +# if !(defined __cplusplus && defined GNULIB_NAMESPACE) +# undef select +# define select select_used_without_including_sys_select_h +# else + _GL_WARN_ON_USE (select, + "select() used without including <sys/select.h>"); +# endif #endif #if @GNULIB_ACCEPT4@ |