From: Paul Eggert <eggert@cs.ucla.edu>
Date: Tue, 22 May 2012 13:10:34 +0000 (-0700)
Subject: mktime: merge time_r change from gnulib
X-Git-Tag: glibc-2.16-tps~213
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2554247d83080250693a60f9aca91820af4234e0;p=thirdparty%2Fglibc.git

mktime: merge time_r change from gnulib
---

diff --git a/ChangeLog b/ChangeLog
index a148b39fa5e..1b957aa6ae9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2012-05-22  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 DEBUG change from gnulib
 	* time/mktime.c (mktime) [DEBUG]: #undef before #define-ing, in
 	case system <time.h> has a #define.
diff --git a/time/mktime.c b/time/mktime.c
index d0b7738dec5..15659d3d228 100644
--- a/time/mktime.c
+++ b/time/mktime.c
@@ -141,11 +141,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