Merge from gnulib

This incorporates:
2015-07-27 time_rz: port better to MinGW
2015-07-27 time: port __need_time_t to MinGW
* lib/gnulib.mk, m4/gnulib-comp.m4: Regenerate.
* lib/strftime.c, lib/time.in.h, lib/time_rz.c: Copy from gnulib.
* lib/time-internal.h: New file, from gnulib.

1 files changed, 6 insertions, 6 deletions

diff --git a/lib/time.in.h b/lib/time.in.h
index 1adfe925398..a90552ce447 100644
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -22,13 +22,13 @@
 
 /* Don't get in the way of glibc when it includes time.h merely to
    declare a few standard symbols, rather than to declare all the
-   symbols.  Also, Solaris 8 <time.h> eventually includes itself
+   symbols.  (However, skip this for MinGW as it treats __need_time_t
+   incompatibly.)  Also, Solaris 8 <time.h> eventually includes itself
    recursively; if that is happening, just include the system <time.h>
-   without adding our own declarations.  MinGW system headers use
-   these symbols as well, but we don't want to exclude MinGW from the
-   'else' branch below.  */
-#if (((defined __need_time_t || defined __need_clock_t          \
-       || defined __need_timespec) && !defined __MINGW32__)     \
+   without adding our own declarations.  */
+#if (((defined __need_time_t || defined __need_clock_t \
+       || defined __need_timespec)                     \
+      && !defined __MINGW32__)                         \
      || defined _@GUARD_PREFIX@_TIME_H)
 
 # @INCLUDE_NEXT@ @NEXT_TIME_H@