From 719ff2a7c65cd5ffd255c30ea0fe59fe7bff6ed8 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 25 Oct 2008 22:48:11 +0200 Subject: [PATCH] Move HAVE__GL_CLOSE_FD_MAYBE_SOCKET macro. --- ChangeLog | 8 ++++++++ lib/sys_socket.in.h | 5 ----- lib/unistd.in.h | 4 ++++ m4/sys_socket_h.m4 | 3 +-- 4 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1516ccc21..cb538aa08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-10-25 Bruno Haible + + * lib/sys_socket.in.h (HAVE__GL_CLOSE_FD_MAYBE_SOCKET); Move macro from + here ... + * lib/unistd.in.h (HAVE__GL_CLOSE_FD_MAYBE_SOCKET); ... to here. + * m4/sys_socket_h.m4 (gl_SYS_SOCKET_H_DEFAULTS): Remove invocation of + gl_UNISTD_H_DEFAULTS. + 2008-10-25 Eric Blake signbit: avoid spurious compiler failure diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h index 91a6b33a5..83a50bd2d 100644 --- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -388,11 +388,6 @@ extern int rpl_shutdown (int, int); # define select select_used_without_including_sys_select_h # endif -# if @GNULIB_CLOSE@ && @HAVE_WINSOCK2_H@ -/* Need a gnulib internal function. */ -# define HAVE__GL_CLOSE_FD_MAYBE_SOCKET 1 -# endif - # ifdef __cplusplus } # endif diff --git a/lib/unistd.in.h b/lib/unistd.in.h index bfa3d49cb..d949c9916 100644 --- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -78,6 +78,10 @@ extern int chown (const char *file, uid_t uid, gid_t gid); #if @GNULIB_CLOSE@ +# if @UNISTD_H_HAVE_WINSOCK2_H@ +/* Need a gnulib internal function. */ +# define HAVE__GL_CLOSE_FD_MAYBE_SOCKET 1 +# endif # if @REPLACE_CLOSE@ /* Automatically included by modules that need a replacement for close. */ # undef close diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index b7b18e530..9d2d92c5a 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,4 +1,4 @@ -# sys_socket_h.m4 serial 11 +# sys_socket_h.m4 serial 12 dnl Copyright (C) 2005-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -100,7 +100,6 @@ AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR], AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS], [ - AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) dnl for GNULIB_CLOSE GNULIB_SOCKET=0; AC_SUBST([GNULIB_SOCKET]) GNULIB_CONNECT=0; AC_SUBST([GNULIB_CONNECT]) GNULIB_ACCEPT=0; AC_SUBST([GNULIB_ACCEPT]) -- 2.11.0