select: simplify

[Bruno Haible]

I'm applying this obvious code simplification:


2011-05-21  Bruno Haible  <address@hidden>

        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.

--- lib/sys_select.in.h.orig    Sat May 21 22:25:45 2011
+++ lib/sys_select.in.h Sat May 21 22:24:56 2011
@@ -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
--- m4/select.m4.orig   Sat May 21 22:25:45 2011
+++ m4/select.m4        Sat May 21 22:25:31 2011
@@ -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_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
--- modules/select.orig Sat May 21 22:25:45 2011
+++ modules/select      Sat May 21 22:25:11 2011
@@ -7,8 +7,8 @@
 
 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

-- 
In memoriam Alfred Grünberg <http://en.wikipedia.org/wiki/Alfred_Grünberg>