New module 'ioctl'.

diff --git a/ChangeLog b/ChangeLog
index 09a89678eb5d253bc98bebaf87b69d04a37bbc79..37f0bbf4e0216b2f62e4e91e80d6158269a56e43 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2008-10-09  Bruno Haible  <bruno@clisp.org>
+
+       New module 'ioctl'.
+       * modules/ioctl: New file.
+       * lib/sys_socket.in.h (ioctl): Remove declaration.
+       * lib/winsock.c: Include <sys/ioctl.h>.
+       (rpl_ioctl): Define only of the gnulib module 'ioctl' is present.
+       * m4/sys_socket_h.m4 (gl_PREREQ_SYS_H_WINSOCK2): Require
+       gl_SYS_IOCTL_H_DEFAULTS. Set also SYS_IOCTL_H_HAVE_WINSOCK2_H.
+       * modules/sys_socket (Files): Add m4/sys_ioctl_h.m4.
+       * doc/posix-functions/ioctl.texi: Mention the new module.
+
 2008-10-09  Bruno Haible  <bruno@clisp.org>
 
        New module 'sys_ioctl'.

diff --git a/doc/posix-functions/ioctl.texi b/doc/posix-functions/ioctl.texi
index 86235d897c79e8047e18039e4b02a36d6fee2dff..123069b8ccc783f330a8b9a11aa1d2422aa44867 100644 (file)
--- a/doc/posix-functions/ioctl.texi
+++ b/doc/posix-functions/ioctl.texi
@@ -4,7 +4,7 @@
 
 POSIX specification: @url{http://www.opengroup.org/susv3xsh/ioctl.html}
 
-Gnulib module: sys_socket
+Gnulib module: ioctl
 
 Portability problems fixed by Gnulib:
 @itemize

diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index ddc4264eae3a4c3454818419030a7c8b0e938fae..ad0860c701181f335f9d64c9a0445d901ba3884a 100644 (file)
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -279,12 +279,6 @@ extern int rpl_listen (int, int);
       listen (s, b))
 # endif
 
-# if @HAVE_WINSOCK2_H@
-#  undef ioctl
-#  define ioctl                        rpl_ioctl
-extern int rpl_ioctl (int, int, ...);
-# endif
-
 # if @GNULIB_RECV@
 #  if @HAVE_WINSOCK2_H@
 #   undef recv

diff --git a/lib/winsock.c b/lib/winsock.c
index 53b9336b95f0739981c9ba3e66dc93034d38e96a..2ca7813638c9483a97736ac09394787302be424a 100644 (file)
--- a/lib/winsock.c
+++ b/lib/winsock.c
@@ -25,6 +25,9 @@
 #include <fcntl.h>
 #include <io.h>
 #include <sys/socket.h>
+#if GNULIB_IOCTL
+#include <sys/ioctl.h>
+#endif
 
 #undef socket
 #undef connect
@@ -224,6 +227,7 @@ rpl_listen (int fd, int backlog)
 }
 #endif
 
+#if GNULIB_IOCTL
 int
 rpl_ioctl (int fd, int req, ...)
 {
@@ -243,6 +247,7 @@ rpl_ioctl (int fd, int req, ...)
 
   return r;
 }
+#endif
 
 #if GNULIB_RECV
 int

diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
index e61de7bcbf020fe533605340d3237f153bd7d29e..e60ce7337d084190dfc2fbb59bdb8254f6d608e5 100644 (file)
--- a/m4/sys_socket_h.m4
+++ b/m4/sys_socket_h.m4
@@ -1,4 +1,4 @@
-# sys_socket_h.m4 serial 9
+# sys_socket_h.m4 serial 10
 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,
@@ -72,6 +72,7 @@ AC_DEFUN([gl_HEADER_SYS_SOCKET],
 AC_DEFUN([gl_PREREQ_SYS_H_WINSOCK2],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
+  AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])
   AC_CHECK_HEADERS_ONCE([sys/socket.h])
   if test $ac_cv_header_sys_socket_h != yes; then
     dnl We cannot use AC_CHECK_HEADERS_ONCE here, because that would make
@@ -83,6 +84,7 @@ AC_DEFUN([gl_PREREQ_SYS_H_WINSOCK2],
   if test "$ac_cv_header_winsock2_h" = yes; then
     HAVE_WINSOCK2_H=1
     UNISTD_H_HAVE_WINSOCK2_H=1
+    SYS_IOCTL_H_HAVE_WINSOCK2_H=1
   else
     HAVE_WINSOCK2_H=0
   fi

diff --git a/modules/ioctl b/modules/ioctl
new file mode 100644 (file)
index 0000000..b425dee
--- /dev/null
+++ b/modules/ioctl
@@ -0,0 +1,30 @@
+Description:
+ioctl() function: issue device specific requests on files, devices, or sockets.
+
+Files:
+lib/winsock.c
+
+Depends-on:
+sys_ioctl
+sys_socket
+errno
+
+configure.ac:
+AC_REQUIRE([gl_HEADER_SYS_SOCKET])
+if test "$ac_cv_header_winsock2_h" = yes; then
+  AC_LIBOBJ([winsock])
+  gl_REPLACE_SYS_IOCTL_H
+fi
+gl_SYS_IOCTL_MODULE_INDICATOR([ioctl])
+gl_MODULE_INDICATOR([ioctl])
+
+Makefile.am:
+
+Include:
+<sys/ioctl.h>
+
+License:
+LGPLv2+
+
+Maintainer:
+Paolo Bonzini, Simon Josefsson, Bruno Haible

diff --git a/modules/sys_socket b/modules/sys_socket
index 0d435707eda86ccdd320ed61b61f3a8940c75606..016dedd591c56503e0dd47decdff5ee0cb2990ee 100644 (file)
--- a/modules/sys_socket
+++ b/modules/sys_socket
@@ -7,6 +7,7 @@ lib/winsock.c
 m4/sys_socket_h.m4
 m4/sockpfaf.m4
 m4/unistd_h.m4
+m4/sys_ioctl_h.m4
 
 Depends-on:
 include_next