about summary refs log tree commit diff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2012-05-22 06:11:29 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-22 06:11:29 -0700
commit643e01e6cbbcb37daa53e8020f099c9822615026 (patch)
treeaa7ce9c890e21b941872e372ac7f64b26fe5130d
parent2554247d83080250693a60f9aca91820af4234e0 (diff)
downloadglibc-643e01e6cbbcb37daa53e8020f099c9822615026.tar.gz
glibc-643e01e6cbbcb37daa53e8020f099c9822615026.tar.xz
glibc-643e01e6cbbcb37daa53e8020f099c9822615026.zip
mktime: merge mktime-internal.h change from gnulib
-rw-r--r--ChangeLog3
-rw-r--r--time/mktime.c1
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1b957aa6ae..7cd5cb0df8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-22  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 15659d3d22..5a4f74203d 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -148,6 +148,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) -