bug-gnulib
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: winsock.c split


From: Bruno Haible
Subject: Re: winsock.c split
Date: Sat, 25 Oct 2008 22:48:33 +0200
User-agent: KMail/1.5.4

> 2008-10-21  Bruno Haible  <address@hidden>
> 
>       Simplification.
>       * lib/sys_socket.in.h (_gl_close_fd_maybe_socket): Remove declaration.
>       * lib/close.c (_gl_close_fd_maybe_socket): Make static.

Another simplification:


2008-10-25  Bruno Haible  <address@hidden>

        * 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.
        
--- lib/sys_socket.in.h.orig    2008-10-25 22:40:42.000000000 +0200
+++ lib/sys_socket.in.h 2008-10-25 22:35:31.000000000 +0200
@@ -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
--- lib/unistd.in.h.orig        2008-10-25 22:40:43.000000000 +0200
+++ lib/unistd.in.h     2008-10-25 22:35:31.000000000 +0200
@@ -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
--- m4/sys_socket_h.m4.orig     2008-10-25 22:40:43.000000000 +0200
+++ m4/sys_socket_h.m4  2008-10-25 22:40:32.000000000 +0200
@@ -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])





reply via email to

[Prev in Thread] Current Thread [Next in Thread]