time: Undefine more broken macros.

diff --git a/ChangeLog b/ChangeLog
index 93e04f986a3ec0bd133fc7d6710a7ff5dd0f50d9..84fdd9012d133fe01c25618ce1f86269e11cb533 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-06-03  Bruno Haible  <bruno@clisp.org>
+
+       time: Undefine more broken macros.
+       * lib/time.in.h: Undefine broken localtime_r and gmtime_r macros only
+       for pthread-win32. Undefine also asctime_r, ctime_r, rand_r, strtok_r.
+       Reported by Eric Blake.
+
 2010-06-03  Bruno Haible  <bruno@clisp.org>
 
        Choose among AC_DEFUN_ONCE, AC_DEFUN in a way that aclocal understands.

diff --git a/lib/time.in.h b/lib/time.in.h
index 6d2b818024cb624cab7534964486791df6a83a78..87608a39cb81e37294b9ec2d60f4b4a228ca17ac 100644 (file)
--- a/lib/time.in.h
+++ b/lib/time.in.h
@@ -55,6 +55,13 @@
 #   include <sys/time.h>
 #  elif @PTHREAD_H_DEFINES_STRUCT_TIMESPEC@
 #   include <pthread.h>
+/* The pthreads-win32 <pthread.h> also defines a couple of broken macros.  */
+#   undef asctime_r
+#   undef ctime_r
+#   undef gmtime_r
+#   undef localtime_r
+#   undef rand_r
+#   undef strtok_r
 #  else
 
 #   ifdef __cplusplus
@@ -131,7 +138,6 @@ _GL_CXXALIAS_RPL (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result));
 #  else
 #   if ! @HAVE_LOCALTIME_R@
-#    undef localtime_r
 _GL_FUNCDECL_SYS (localtime_r, struct tm *, (time_t const *restrict __timer,
                                              struct tm *restrict __result)
                                             _GL_ARG_NONNULL ((1, 2)));
@@ -152,7 +158,6 @@ _GL_CXXALIAS_RPL (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result));
 #  else
 #   if ! @HAVE_LOCALTIME_R@
-#    undef gmtime_r
 _GL_FUNCDECL_SYS (gmtime_r, struct tm *, (time_t const *restrict __timer,
                                           struct tm *restrict __result)
                                          _GL_ARG_NONNULL ((1, 2)));