This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 09/17] mktime: merge time_r change from gnulib
- From: Paul Eggert <eggert at cs dot ucla dot edu>
- To: GNU C Library <libc-alpha at sourceware dot org>
- Date: Fri, 16 Mar 2012 03:36:31 -0700
- Subject: [PATCH 09/17] mktime: merge time_r change from gnulib
* time/mktime.c [!_LIBC]: Do not include "time_r.h".
---
ChangeLog | 3 +++
time/mktime.c | 3 +--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 101e4ed..48e73e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-03-16 Paul Eggert <eggert@cs.ucla.edu>
+ mktime: merge time_r change from gnulib
+ * time/mktime.c [!_LIBC]: Do not include "time_r.h".
+
mktime: merge another wrapv change from gnulib
* time/mktime.c (TYPE_MAXIMUM): Rework slightly to avoid diagnostics
from some compilers.
diff --git a/time/mktime.c b/time/mktime.c
index c7ac89a..ecab6f4 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -167,11 +167,10 @@ const unsigned short int __mon_yday[2][13] =
#ifndef _LIBC
-/* Portable standalone applications should supply a "time_r.h" that
+/* Portable standalone applications should supply a <time.h> that
declares a POSIX-compliant localtime_r, for the benefit of older
implementations that lack localtime_r or have a nonstandard one.
See the gnulib time_r module for one way to implement this. */
-# include "time_r.h"
# undef __localtime_r
# define __localtime_r localtime_r
# define __mktime_internal mktime_internal
--
1.7.6.5