From bfd11c25219f5800465e67a01c580e4b9099d209 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 19 Mar 2013 09:08:47 -0700 Subject: [PATCH] sys_select: Port 2013-01-30 Solaris 2.6 fix to Cygwin. Problem reported by Marco Atzeri in . * lib/sys_select.in.h [HAVE_SYS_SELECT_H && _CYGWIN_SYS_TIME_H]: Simply delegate to the system in this case too. --- ChangeLog | 8 ++++++++ lib/sys_select.in.h | 5 ++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 98d74d3..24e44c2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2013-03-19 Paul Eggert + + sys_select: Port 2013-01-30 Solaris 2.6 fix to Cygwin. + Problem reported by Marco Atzeri in + . + * lib/sys_select.in.h [HAVE_SYS_SELECT_H && _CYGWIN_SYS_TIME_H]: + Simply delegate to the system in this case too. + 2013-01-27 Jim Meyering prefix-gnulib-mk: give better diagnostics diff --git a/lib/sys_select.in.h b/lib/sys_select.in.h index 5a88d51..117442d 100644 --- a/lib/sys_select.in.h +++ b/lib/sys_select.in.h @@ -21,6 +21,7 @@ /* On OSF/1 and Solaris 2.6, and both include . + On Cygwin, includes . Simply delegate to the system's header in this case. */ #if (@HAVE_SYS_SELECT_H@ \ && ((defined __osf__ && defined _SYS_TYPES_H_ && defined _OSF_SOURCE) \ @@ -33,7 +34,9 @@ # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ #elif (@HAVE_SYS_SELECT_H@ \ - && ((defined __osf__ && defined _SYS_TIME_H_ && defined _OSF_SOURCE) \ + && (defined _CYGWIN_SYS_TIME_H \ + || (defined __osf__ && defined _SYS_TIME_H_ \ + && defined _OSF_SOURCE) \ || (defined __sun && defined _SYS_TIME_H \ && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ || defined __EXTENSIONS__))) \ -- 1.7.11.7