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.

diff --git a/ChangeLog b/ChangeLog
index 91f48c15f583696a665b5128ece516900a8891f0..fcdfe3c2861293f26aff102920aba23dc5f0d795 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2011-05-22  Bruno Haible  <bruno@clisp.org>
+
+       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  <bruno@clisp.org>
 
        timegm: Simplify autoconf macro.

diff --git a/m4/timegm.m4 b/m4/timegm.m4
index a47984cef42157e1cfb4db8799cb2727a2e62691..62e76b44376eb7f475b38a34564e661149d82dd2 100644 (file)
--- 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
 ])