From bd83aabe5a14f6e741c80b61f8d0d981baeb2e70 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 22 May 2012 06:07:58 -0700 Subject: [PATCH] mktime: merge change from gnulib --- ChangeLog | 4 ++++ time/mktime.c | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index ad865fd..d33c223 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2012-05-22 Paul Eggert + mktime: merge change from gnulib + * time/mktime.c: Do not include ; no longer needed, + since is now guaranteed to define time_t. + mktime: merge HAVE_CONFIG_H change from gnulib * time/mktime.c: Include if !_LIBC, not if HAVE_CONFIG_H. diff --git a/time/mktime.c b/time/mktime.c index 0e5fde0..e4b3b66 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -32,7 +32,6 @@ # define LEAP_SECONDS_POSSIBLE 1 #endif -#include /* Some systems define `time_t' here. */ #include #include -- 2.7.4