Mercurial > hg > octave-lojdl > gnulib-hg

changeset 11800:340d92316913

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add comment.
author Bruno Haible <bruno@clisp.org>
date Mon, 10 Aug 2009 22:53:54 +0200
parents 4956134d1aaf
children a29d6bab4448
files ChangeLog m4/close.m4 modules/ioctl
diffstat 3 files changed, 12 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-08-10  Bruno Haible  <bruno@clisp.org>
+
+	* m4/close.m4 (gl_FUNC_CLOSE): Add comment.
+	* modules/ioctl (configure.ac): Likewise.
+
 2009-08-10  Bruno Haible  <bruno@clisp.org>
 
 	Avoid collision between gnulib wrapper and libintl wrapper.
--- 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 @@
   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
   ])
--- a/modules/ioctl
+++ b/modules/ioctl
@@ -13,6 +13,9 @@
 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