From 95770f140bf0c9ecb8ee3a9c00de5248e7e5cc61 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Tue, 22 May 2012 06:05:37 -0700 Subject: [PATCH] mktime: merge HAVE_CONFIG_H change from gnulib --- ChangeLog | 5 +++++ time/mktime.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 200c726994..ad865fdfd3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2012-05-22 Paul Eggert + + mktime: merge HAVE_CONFIG_H change from gnulib + * time/mktime.c: Include if !_LIBC, not if HAVE_CONFIG_H. + 2012-05-22 H.J. Lu * sysdeps/unix/sysv/linux/x86_64/sysdep.h (SYSCALL_SET_ERRNO): diff --git a/time/mktime.c b/time/mktime.c index 683d468231..0e5fde015b 100644 --- a/time/mktime.c +++ b/time/mktime.c @@ -21,7 +21,7 @@ mktime. */ /* #define DEBUG 1 */ -#ifdef HAVE_CONFIG_H +#ifndef _LIBC # include #endif