diff --git a/ChangeLog b/ChangeLog index ad865fdfd3..d33c22359a 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 0e5fde015b..e4b3b66bc8 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