Fix compilation error on mingw when module 'time_r' is not used.

diff --git a/ChangeLog b/ChangeLog
index 305a835768feb893891a5a2cbc53152a68ad92f0..129dd8affb7675f83c9cced3fadad08b2cbbff3d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-03-14  Bruno Haible  <bruno@clisp.org>
+
+       Fix compilation error on mingw when module 'time_r' is not used.
+       * lib/time.in.h (localtime_r, gmtime_r): Declare only if GNULIB_TIME_R
+       is 1.
+       * tests/test-time-c++.cc (localtime_r, gmtime_r): Likewise.
+       * modules/time_r (configure.ac): Invoke gl_TIME_MODULE_INDICATOR.
+       * modules/time (Makefile.am): Substitute GNULIB_TIME_R.
+       * m4/time_h.m4 (gl_HEADER_TIME_H_DEFAULTS): Initialize GNULIB_TIME_R.
+
 2010-03-14  Bruno Haible  <bruno@clisp.org>
 
        Fix compilation error with Sun C.

diff --git a/lib/time.in.h b/lib/time.in.h
index d2cf84be649b0e28b8e787a4d92652a346b0cd5a..a5d3ae456b31a9936d0b2f4cdeb8bf68f84d17d1 100644 (file)
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -108,36 +108,38 @@ _GL_CXXALIASWARN (mktime);
 /* Convert TIMER to RESULT, assuming local time and UTC respectively.  See
    <http://www.opengroup.org/susv3xsh/localtime_r.html> and
    <http://www.opengroup.org/susv3xsh/gmtime_r.html>.  */
-# if @REPLACE_LOCALTIME_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef localtime_r
-#   define localtime_r rpl_localtime_r
-#  endif
+# if @GNULIB_TIME_R@
+#  if @REPLACE_LOCALTIME_R@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef localtime_r
+#    define localtime_r rpl_localtime_r
+#   endif
 _GL_FUNCDECL_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result)
                                             _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result));
-# else
+#  else
 _GL_CXXALIAS_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result));
-# endif
-_GL_CXXALIASWARN (localtime_r);
-# if @REPLACE_LOCALTIME_R@
-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
-#   undef gmtime_r
-#   define gmtime_r rpl_gmtime_r
 #  endif
+_GL_CXXALIASWARN (localtime_r);
+#  if @REPLACE_LOCALTIME_R@
+#   if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+#    undef gmtime_r
+#    define gmtime_r rpl_gmtime_r
+#   endif
 _GL_FUNCDECL_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result)
                                          _GL_ARG_NONNULL ((1, 2)));
 _GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result));
-# else
+#  else
 _GL_CXXALIAS_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result));
-# endif
+#  endif
 _GL_CXXALIASWARN (gmtime_r);
+# endif
 
 /* Parse BUF as a time stamp, assuming FORMAT specifies its layout, and store
    the resulting broken-down time into TM.  See

diff --git a/m4/time_h.m4 b/m4/time_h.m4
index ba2e194608c072b6c0d947d9c6fc537606382626..f572b859484ffab556a8192be11ea8be78c046e8 100644 (file)
--- a/m4/time_h.m4
+++ b/m4/time_h.m4
@@ -76,6 +76,7 @@ AC_DEFUN([gl_HEADER_TIME_H_DEFAULTS],
   GNULIB_NANOSLEEP=0;                    AC_SUBST([GNULIB_NANOSLEEP])
   GNULIB_STRPTIME=0;                     AC_SUBST([GNULIB_STRPTIME])
   GNULIB_TIMEGM=0;                       AC_SUBST([GNULIB_TIMEGM])
+  GNULIB_TIME_R=0;                       AC_SUBST([GNULIB_TIME_R])
   dnl If another module says to replace or to not replace, do that.
   dnl Otherwise, replace only if someone compiles with -DGNULIB_PORTCHECK;
   dnl this lets maintainers check for portability.

diff --git a/modules/time b/modules/time
index 02c7a20b26c7c1ade3f216895502ac507a2cad00..733c9695b72586df787d6ce71bd01e8e34e1dc94 100644 (file)
--- a/modules/time
+++ b/modules/time
@@ -31,6 +31,7 @@ time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
              -e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
              -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \
              -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \
+             -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \
              -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
              -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
              -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \

diff --git a/modules/time_r b/modules/time_r
index 8349bcf4a9301b0c58d304162641d6081151b91f..f181b5d590d589d19d41eec3c888e1a38815ad5e 100644 (file)
--- a/modules/time_r
+++ b/modules/time_r
@@ -11,6 +11,7 @@ time
 
 configure.ac:
 gl_TIME_R
+gl_TIME_MODULE_INDICATOR([time_r])
 
 Makefile.am:
 

diff --git a/tests/test-time-c++.cc b/tests/test-time-c++.cc
index 501345f145185ae268c20d9115ec3c510a207e9a..bb6fd20b90d5289c0aab84401db372db9ea468b0 100644 (file)
--- a/tests/test-time-c++.cc
+++ b/tests/test-time-c++.cc
@@ -33,11 +33,13 @@ SIGNATURE_CHECK (GNULIB_NAMESPACE::nanosleep, int,
 SIGNATURE_CHECK (GNULIB_NAMESPACE::mktime, time_t, (struct tm *));
 #endif
 
+#if GNULIB_TIME_R
 SIGNATURE_CHECK (GNULIB_NAMESPACE::localtime_r, struct tm *,
                  (time_t const *, struct tm *));
 
 SIGNATURE_CHECK (GNULIB_NAMESPACE::gmtime_r, struct tm *,
                  (time_t const *, struct tm *));
+#endif
 
 #if GNULIB_STRPTIME
 SIGNATURE_CHECK (GNULIB_NAMESPACE::strptime, char *,