Mercurial > gnulib

comparison lib/sys_select.in.h @ 17363:5a51fb7777a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
sys_select, sys_time: port 2013-01-30 Solaris 2.6 fix to Cygwin Problem reported by Marco Atzeri in <http://lists.gnu.org/archive/html/bug-gnulib/2013-03/msg00000.html>. * lib/sys_select.in.h [HAVE_SYS_SELECT_H && _CYGWIN_SYS_TIME_H]: Simply delegate to the system <sys/select.h> in this case too. Also, pay attention to _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H only if OSF/1, since otherwise Cygwin breaks, and it doesn't seem to be needed on Solaris either. * lib/sys_time.in.h [_CYGWIN_SYS_TIME_H]: Simply delgate to the system <sys/time.h> in this case.
author Paul Eggert <eggert@cs.ucla.edu>
date Tue, 19 Mar 2013 09:08:47 -0700
parents 0e38241a3d05
children 344018b6e5d7
comparison
equal deleted inserted replaced
17362:7a2e583edf71 17363:5a51fb7777a9
19 # endif 19 # endif
20 @PRAGMA_COLUMNS@ 20 @PRAGMA_COLUMNS@
21 21
22 /* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h> 22 /* On OSF/1 and Solaris 2.6, <sys/types.h> and <sys/time.h>
23 both include <sys/select.h>. 23 both include <sys/select.h>.
24 On Cygwin, <sys/time.h> includes <sys/select.h>.
24 Simply delegate to the system's header in this case. */ 25 Simply delegate to the system's header in this case. */
25 #if (@HAVE_SYS_SELECT_H@ \ 26 #if (@HAVE_SYS_SELECT_H@ \
26 && ((defined __osf__ && defined _SYS_TYPES_H_ && defined _OSF_SOURCE) \ 27 && ((defined __osf__ && defined _SYS_TYPES_H_ \
28 && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \
29 && defined _OSF_SOURCE) \
27 || (defined __sun && defined _SYS_TYPES_H \ 30 || (defined __sun && defined _SYS_TYPES_H \
28 && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ 31 && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \
29 || defined __EXTENSIONS__))) \ 32 || defined __EXTENSIONS__))))
30 && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H)
31 33
32 # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H 34 # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TYPES_H
33 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ 35 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
34 36
35 #elif (@HAVE_SYS_SELECT_H@ \ 37 #elif (@HAVE_SYS_SELECT_H@ \
36 && ((defined __osf__ && defined _SYS_TIME_H_ && defined _OSF_SOURCE) \ 38 && (defined _CYGWIN_SYS_TIME_H \
39 || (defined __osf__ && defined _SYS_TIME_H_ \
40 && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H \
41 && defined _OSF_SOURCE) \
37 || (defined __sun && defined _SYS_TIME_H \ 42 || (defined __sun && defined _SYS_TIME_H \
38 && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \ 43 && (! (defined _XOPEN_SOURCE || defined _POSIX_C_SOURCE) \
39 || defined __EXTENSIONS__))) \ 44 || defined __EXTENSIONS__))))
40 && !defined _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H)
41 45
42 # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H 46 # define _GL_SYS_SELECT_H_REDIRECT_FROM_SYS_TIME_H
43 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@ 47 # @INCLUDE_NEXT@ @NEXT_SYS_SELECT_H@
44 48
45 /* On IRIX 6.5, <sys/timespec.h> includes <sys/types.h>, which includes 49 /* On IRIX 6.5, <sys/timespec.h> includes <sys/types.h>, which includes