mktime: merge mktime-internal.h change from gnulib

diff --git a/ChangeLog b/ChangeLog
index 1b957aa6ae9b6f1b346ab90065b8ed4cdb04e1f5..7cd5cb0df8c05635140cee7f9d262f07bb9bc75d 100644 (file)
--- 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 15659d3d228eda1b8d51dc8a1c77865c459edce8..5a4f74203dc8c992ece5856380212a1c091dd59b 100644 (file)
--- 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) -