Mercurial > gnulib
changeset 14789:0e87a6225f1a
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.
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Sat, 21 May 2011 22:28:43 +0200 |
| parents | 0b9360a3b14b |
| children | 05edc014c6fe |
| files | ChangeLog lib/sys_select.in.h m4/select.m4 modules/select |
| diffstat | 4 files changed, 13 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat May 21 20:13:03 2011 +0200 +++ b/ChangeLog Sat May 21 22:28:43 2011 +0200 @@ -1,3 +1,11 @@ +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.
--- a/lib/sys_select.in.h Sat May 21 20:13:03 2011 +0200 +++ b/lib/sys_select.in.h Sat May 21 22:28:43 2011 +0200 @@ -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
--- a/m4/select.m4 Sat May 21 20:13:03 2011 +0200 +++ b/m4/select.m4 Sat May 21 22:28:43 2011 +0200 @@ -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
--- a/modules/select Sat May 21 20:13:03 2011 +0200 +++ b/modules/select Sat May 21 22:28:43 2011 +0200 @@ -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