diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-02-03 21:04:39 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-02-03 21:05:52 -0500 |
| commit | 5e69ceb7a667377a61cb0c31d7ac20e245b3fafd (patch) | |
| tree | ef1e4fe569392fd4630dfcfc26d9948b7e6ffac5 /lib/sys_time.in.h | |
| parent | 866af5da3d11ac4a9df44ee8c5b1781a0073c288 (diff) | |
| download | guile-5e69ceb7a667377a61cb0c31d7ac20e245b3fafd.tar.gz | |
Update Gnulib to v0.1-77-gd9361da
Diffstat (limited to 'lib/sys_time.in.h')
| -rw-r--r-- | lib/sys_time.in.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index f2398c569..f19326e02 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -1,6 +1,6 @@ /* Provide a more complete sys/time.h. - Copyright (C) 2007-2013 Free Software Foundation, Inc. + Copyright (C) 2007-2014 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by @@ -24,6 +24,15 @@ #endif @PRAGMA_COLUMNS@ +/* On Cygwin and on many BSDish systems, <sys/time.h> includes itself + recursively via <sys/select.h>. + Simply delegate to the system's header in this case; it is a no-op. + Without this extra ifdef, the C++ gettimeofday declaration below + would be a forward declaration in gnulib's nested <sys/time.h>. */ +#if defined _CYGWIN_SYS_TIME_H || defined _SYS_TIME_H || defined _SYS_TIME_H_ +# @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ +#else + /* The include_next requires a split double-inclusion guard. */ #if @HAVE_SYS_TIME_H@ # @INCLUDE_NEXT@ @NEXT_SYS_TIME_H@ @@ -200,4 +209,5 @@ _GL_WARN_ON_USE (gettimeofday, "gettimeofday is unportable - " #endif #endif /* _@GUARD_PREFIX@_SYS_TIME_H */ +#endif /* _CYGWIN_SYS_TIME_H */ #endif /* _@GUARD_PREFIX@_SYS_TIME_H */ |