From 60b73b0521f30d7c9b99fb98e09077376abee49a Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 May 2011 15:54:36 +0200 Subject: [PATCH] timegm: Correct mktime replacement statements. * m4/timegm.m4 (gl_PREREQ_TIMEGM): Set REPLACE_MKTIME, instead of defining mktime as a C macro. This completes a 2009-07-28 commit. --- ChangeLog | 6 ++++++ m4/timegm.m4 | 3 +-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 91f48c15f5..fcdfe3c286 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2011-05-22 Bruno Haible + + timegm: Correct mktime replacement statements. + * m4/timegm.m4 (gl_PREREQ_TIMEGM): Set REPLACE_MKTIME, instead of + defining mktime as a C macro. This completes a 2009-07-28 commit. + 2011-05-22 Bruno Haible timegm: Simplify autoconf macro. diff --git a/m4/timegm.m4 b/m4/timegm.m4 index a47984cef4..62e76b4437 100644 --- a/m4/timegm.m4 +++ b/m4/timegm.m4 @@ -32,8 +32,7 @@ AC_DEFUN([gl_PREREQ_TIMEGM], [ [# mktime works but it doesn't export __mktime_internal, # so we need to substitute our own mktime implementation. AC_LIBOBJ([mktime]) - AC_DEFINE([mktime], [rpl_mktime], - [Define to rpl_mktime if the replacement function should be used.]) + REPLACE_MKTIME=1 gl_PREREQ_MKTIME]) fi ]) -- 2.30.2