From 6c99c5d12c408e6e0429edac4a86771d1543edaf Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 10 Aug 2009 22:53:54 +0200 Subject: [PATCH] Add comment. --- ChangeLog | 5 +++++ m4/close.m4 | 5 ++++- modules/ioctl | 3 +++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8bbb54feb..cf2f2b57c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2009-08-10 Bruno Haible + * m4/close.m4 (gl_FUNC_CLOSE): Add comment. + * modules/ioctl (configure.ac): Likewise. + +2009-08-10 Bruno Haible + Avoid collision between gnulib wrapper and libintl wrapper. * lib/stdio-write.c (printf): Don't define if a printf wrapper is already defined in intl/printf.c. diff --git a/m4/close.m4 b/m4/close.m4 index b1189f5f5..a6623a330 100644 --- a/m4/close.m4 +++ b/m4/close.m4 @@ -1,4 +1,4 @@ -# close.m4 serial 3 +# close.m4 serial 4 dnl Copyright (C) 2008-2009 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,6 +9,9 @@ AC_DEFUN([gl_FUNC_CLOSE], m4_ifdef([gl_PREREQ_SYS_H_WINSOCK2], [ gl_PREREQ_SYS_H_WINSOCK2 if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then + dnl Even if the 'socket' module is not used here, another part of the + dnl application may use it and pass file descriptors that refer to + dnl sockets to the close() function. So enable the support for sockets. gl_REPLACE_CLOSE fi ]) diff --git a/modules/ioctl b/modules/ioctl index 08e595518..fbc8dc855 100644 --- a/modules/ioctl +++ b/modules/ioctl @@ -13,6 +13,9 @@ errno configure.ac: AC_REQUIRE([gl_HEADER_SYS_SOCKET]) if test "$ac_cv_header_winsock2_h" = yes; then + dnl Even if the 'socket' module is not used here, another part of the + dnl application may use it and pass file descriptors that refer to + dnl sockets to the ioctl() function. So enable the support for sockets. AC_LIBOBJ([ioctl]) gl_REPLACE_SYS_IOCTL_H fi -- 2.11.0