select: Simplify replacement idiom.

* m4/select.m4 (gl_FUNC_SELECT): Set REPLACE_SELECT also on native
Win32 platforms.
* lib/sys_select.in.h (select): Simplify accordingly.
* modules/select (Depends-on): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 5451dcd..6e14e2c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+       select: Simplify replacement idiom.
+       * m4/select.m4 (gl_FUNC_SELECT): Set REPLACE_SELECT also on native
+       Win32 platforms.
+       * lib/sys_select.in.h (select): Simplify accordingly.
+       * modules/select (Depends-on): Likewise.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
        mkdir-p: Simplify autoconf macro.
        * m4/mkdir-p.m4 (gl_MKDIR_PARENTS): Don't require gl_FUNC_LCHMOD,
        gl_FUNC_LCHOWN.

diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h
index c378f10..acc0352 100644 (file)
--- a/lib/sys_select.in.h
+++ b/lib/sys_select.in.h
@@ -89,7 +89,7 @@
 
 
 #if @GNULIB_SELECT@
-# if @HAVE_WINSOCK2_H@ || @REPLACE_SELECT@
+# if @REPLACE_SELECT@
 #  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
 #   undef select
 #   define select rpl_select

diff --git a/m4/select.m4 b/m4/select.m4
index dc771d0..0b21c97 100644 (file)
--- a/m4/select.m4
+++ b/m4/select.m4
@@ -1,4 +1,4 @@
-# select.m4 serial 3
+# select.m4 serial 4
 dnl Copyright (C) 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -10,6 +10,7 @@ AC_DEFUN([gl_FUNC_SELECT],
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
   AC_REQUIRE([gl_SOCKETS])
   if test "$ac_cv_header_winsock2_h" = yes; then
+    REPLACE_SELECT=1
     AC_LIBOBJ([select])
   else
     dnl On Interix 3.5, select(0, NULL, NULL, NULL, timeout) fails with error

diff --git a/modules/select b/modules/select
index ab4af6e..c6412c1 100644 (file)
--- a/modules/select
+++ b/modules/select
@@ -7,8 +7,8 @@ m4/select.m4
 
 Depends-on:
 sys_select
-alloca          [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_SELECT = 1]
-sockets         [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_SELECT = 1]
+alloca          [test $REPLACE_SELECT = 1]
+sockets         [test $REPLACE_SELECT = 1]
 
 configure.ac:
 gl_FUNC_SELECT