Mercurial > hg > octave-lojdl > gnulib-hg
changeset 10714:571b017d5070
Move HAVE__GL_CLOSE_FD_MAYBE_SOCKET macro.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 25 Oct 2008 22:48:11 +0200 |
| parents | a7725c751427 |
| children | 6549114b70b4 |
| files | ChangeLog lib/sys_socket.in.h lib/unistd.in.h m4/sys_socket_h.m4 |
| diffstat | 4 files changed, 13 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-10-25 Bruno Haible <bruno@clisp.org> + + * 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 <ebb9@byu.net> signbit: avoid spurious compiler failure
--- a/lib/sys_socket.in.h +++ b/lib/sys_socket.in.h @@ -388,11 +388,6 @@ # 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
--- a/lib/unistd.in.h +++ b/lib/unistd.in.h @@ -78,6 +78,10 @@ #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
--- 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_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])