Cleanup and simplify winsock split changes.

Simplification.
* lib/sys_socket.in.h (_gl_close_fd_maybe_socket): Remove declaration.
* lib/close.c (_gl_close_fd_maybe_socket): Make static.

Simplification.
* lib/ioctl.c (ioctl): Don't undefine.
* lib/socket.c (socket): Don't undefine.

Remove unused module indicator macros.
* m4/sys_socket_h.m4 (gl_SYS_SOCKET_MODULE_INDICATOR): Don't define
GNULIB_$1 as a C macro.

* doc/posix-functions/close.texi: Undo last change.
* doc/posix-functions/ioctl.texi: Merge the two paragraphs about
Windows platforms.

diff --git a/ChangeLog b/ChangeLog
index 1b7bbfaf543f8eba56a9d7c8bc97ecfafda372b7..132cb8a4d8455db39b30da6ed9acab2e78c6d3fb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,21 @@
+2008-10-21  Bruno Haible  <bruno@clisp.org>
+
+       Simplification.
+       * lib/sys_socket.in.h (_gl_close_fd_maybe_socket): Remove declaration.
+       * lib/close.c (_gl_close_fd_maybe_socket): Make static.
+
+       Simplification.
+       * lib/ioctl.c (ioctl): Don't undefine.
+       * lib/socket.c (socket): Don't undefine.
+
+       Remove unused module indicator macros.
+       * m4/sys_socket_h.m4 (gl_SYS_SOCKET_MODULE_INDICATOR): Don't define
+       GNULIB_$1 as a C macro.
+
+       * doc/posix-functions/close.texi: Undo last change.
+       * doc/posix-functions/ioctl.texi: Merge the two paragraphs about
+       Windows platforms.
+
 2008-10-21  Bruno Haible  <bruno@clisp.org>
 
        Add gethostname() declaration to <unistd.h>.

diff --git a/doc/posix-functions/close.texi b/doc/posix-functions/close.texi
index 7065efaca237846b30d0de722029a8d56f9b66d0..252caea61673512c34f0fef787a66eeb41e1ca02 100644 (file)
--- a/doc/posix-functions/close.texi
+++ b/doc/posix-functions/close.texi
@@ -12,10 +12,6 @@ Portability problems fixed by Gnulib:
 On Windows platforms (excluding Cygwin), @code{socket} and @code{accept}
 do not return file descriptors that can be closed by @code{close}.
 Instead, @code{closesocket} must be used.
-@item
-On Windows platforms (excluding Cygwin), error codes for @code{close}
-are not placed in @code{errno}, and @code{WSAGetLastError} must be
-used instead.
 @end itemize
 
 Portability problems not fixed by Gnulib:

diff --git a/doc/posix-functions/ioctl.texi b/doc/posix-functions/ioctl.texi
index 85ba764a42f9daa3053ec1fa28790e77af70eb38..d1574bb5933392cc1938b8931fa00be2775cf19d 100644 (file)
--- a/doc/posix-functions/ioctl.texi
+++ b/doc/posix-functions/ioctl.texi
@@ -9,11 +9,9 @@ Gnulib module: ioctl
 Portability problems fixed by Gnulib:
 @itemize
 @item
-On Windows platforms (excluding Cygwin), error codes for @code{ioctl}
-are not placed in @code{errno}, and @code{WSAGetLastError} must be
-used instead.
-@item
-@code{ioctl} is called @code{ioctlsocket} under mingw
+On Windows platforms (excluding Cygwin), @code{ioctl} is called
+@code{ioctlsocket}, and error codes for this function are not placed in
+@code{errno}, and @code{WSAGetLastError} must be used instead.
 @end itemize
 
 Portability problems not fixed by Gnulib:

diff --git a/lib/close.c b/lib/close.c
index 79313c0082c29519f09415037012581c25a46e66..74a7adfbbc0ebf370976baa0e12f384508bb9925 100644 (file)
--- a/lib/close.c
+++ b/lib/close.c
@@ -29,7 +29,7 @@
 /* Get set_winsock_errno, FD_TO_SOCKET etc. */
 #include "w32sock.h"
 
-int
+static int
 _gl_close_fd_maybe_socket (int fd)
 {
   SOCKET sock = FD_TO_SOCKET (fd);

diff --git a/lib/ioctl.c b/lib/ioctl.c
index 98a94b672194a5510b9472ac42f58ce88a0bd6bb..a23d363bc508784c357c0f7548daba1229dbfabc 100644 (file)
--- a/lib/ioctl.c
+++ b/lib/ioctl.c
@@ -28,8 +28,6 @@
 /* Get set_winsock_errno, FD_TO_SOCKET etc. */
 #include "w32sock.h"
 
-#undef ioctl
-
 int
 rpl_ioctl (int fd, int req, ...)
 {

diff --git a/lib/socket.c b/lib/socket.c
index f14906a0df4ab3c1a00e42a621bd588050d20158..1fa6928747c2e71eb074bca14fc207e46805ec2a 100644 (file)
--- a/lib/socket.c
+++ b/lib/socket.c
@@ -26,8 +26,6 @@
 /* Get set_winsock_errno, FD_TO_SOCKET etc. */
 #include "w32sock.h"
 
-#undef socket
-
 int
 rpl_socket (int domain, int type, int protocol)
 {

diff --git a/lib/sys_socket.in.h b/lib/sys_socket.in.h
index b703200088c0fa7501f4cb62595a9f1522aad7c0..fcb4a22693f4f289413b480383f18735fac7d084 100644 (file)
--- a/lib/sys_socket.in.h
+++ b/lib/sys_socket.in.h
@@ -389,9 +389,8 @@ extern int rpl_shutdown (int, int);
 # endif
 
 # if @GNULIB_CLOSE@ && @HAVE_WINSOCK2_H@
-/* gnulib internal function.  */
+/* Need a gnulib internal function.  */
 #  define HAVE__GL_CLOSE_FD_MAYBE_SOCKET 1
-extern int _gl_close_fd_maybe_socket (int fd);
 # endif
 
 # ifdef __cplusplus

diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4
index fc43d5c5c089ee054b507346974b2bfd9043f63b..b7b18e53005e7c061ccb912338085adc34f5a838 100644 (file)
--- a/m4/sys_socket_h.m4
+++ b/m4/sys_socket_h.m4
@@ -96,7 +96,6 @@ AC_DEFUN([gl_SYS_SOCKET_MODULE_INDICATOR],
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
   AC_REQUIRE([gl_SYS_SOCKET_H_DEFAULTS])
   GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
-  gl_MODULE_INDICATOR([$1])
 ])
 
 AC_DEFUN([gl_SYS_SOCKET_H_DEFAULTS],