This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH 10/17] mktime: merge mktime-internal.h 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:37:01 -0700
- Subject: [PATCH 10/17] mktime: merge mktime-internal.h change from gnulib
* time/mktime.c [!_LIBC]: Include "mktime-internal.h".
---
ChangeLog | 3 +++
time/mktime.c | 1 +
2 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 48e73e7..84abd94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
2012-03-16 Paul Eggert <eggert@cs.ucla.edu>
+ mktime: merge mktime-internal.h change from gnulib
+ * time/mktime.c [!_LIBC]: Include "mktime-internal.h".
+
mktime: merge time_r change from gnulib
* time/mktime.c [!_LIBC]: Do not include "time_r.h".
diff --git a/time/mktime.c b/time/mktime.c
index ecab6f4..08d55a5 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -174,6 +174,7 @@ const unsigned short int __mon_yday[2][13] =
# undef __localtime_r
# define __localtime_r localtime_r
# define __mktime_internal mktime_internal
+# include "mktime-internal.h"
#endif
/* Return an integer value measuring (YEAR1-YDAY1 HOUR1:MIN1:SEC1) -
--
1.7.6.5