From f8ce376ec852149b64afa282860ec778a4fec328 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Sat, 23 Mar 2013 17:49:50 -0700 Subject: Merge from gnulib. --- lib/sys_time.in.h | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'lib/sys_time.in.h') diff --git a/lib/sys_time.in.h b/lib/sys_time.in.h index 656c3f13ad2..3dbf6320667 100644 --- a/lib/sys_time.in.h +++ b/lib/sys_time.in.h @@ -24,6 +24,14 @@ #endif @PRAGMA_COLUMNS@ +/* On Cygwin, includes itself recursively via . + 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 . */ +#ifdef _CYGWIN_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 +208,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 */ -- cgit v1.2.3