Mercurial > gnulib

comparison lib/sys_time.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 a2d511609297
comparison
equal deleted inserted replaced
17362:7a2e583edf71 17363:5a51fb7777a9
21 21
22 #if __GNUC__ >= 3 22 #if __GNUC__ >= 3
23 @PRAGMA_SYSTEM_HEADER@ 23 @PRAGMA_SYSTEM_HEADER@
24 #endif 24 #endif
25 @PRAGMA_COLUMNS@ 25 @PRAGMA_COLUMNS@
26
27 /* On Cygwin, <sys/time.h> includes itself recursively via <sys/select.h>.
28 Simply delegate to the system's header in this case; it is a no-op.
29 Without this extra ifdef, the C++ gettimeofday declaration below
30 would be a forward declaration in gnulib's nested <sys/time.h>. */
31 #ifdef _CYGWIN_SYS_TIME_H
32 # @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
33 #else
26 34
27 /* The include_next requires a split double-inclusion guard. */ 35 /* The include_next requires a split double-inclusion guard. */
28 #if @HAVE_SYS_TIME_H@ 36 #if @HAVE_SYS_TIME_H@
29 # @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ 37 # @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@
30 #endif 38 #endif
198 # endif 206 # endif
199 # endif 207 # endif
200 #endif 208 #endif
201 209
202 #endif /* _@GUARD_PREFIX@_SYS_TIME_H */ 210 #endif /* _@GUARD_PREFIX@_SYS_TIME_H */
211 #endif /* _CYGWIN_SYS_TIME_H */
203 #endif /* _@GUARD_PREFIX@_SYS_TIME_H */ 212 #endif /* _@GUARD_PREFIX@_SYS_TIME_H */