* m4/gettimeofday.m4 (gl_GETTIMEOFDAY_REPLACE_LOCALTIME): Also

replace gettimeofday.
* lib/gettimeofday.c (rpl_gettimeofday): Declare with replacement
name, to avoid infinite recursion.

diff --git a/ChangeLog b/ChangeLog
index d4169aa9d591d9750ab3fa56353978cb846d17c2..6aabd47de0ce54870b7fe9ff049717062bbbb6a7 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-01-18  Eric Blake  <ebb9@byu.net>
+
+       * m4/gettimeofday.m4 (gl_GETTIMEOFDAY_REPLACE_LOCALTIME): Also
+       replace gettimeofday.
+       * lib/gettimeofday.c (rpl_gettimeofday): Declare with replacement
+       name, to avoid infinite recursion.
+
 2007-01-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        * MODULES.html.sh (Support for systems lacking POSIX:2001): New

diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index 1aee10760701bcd562ca266e939fc1b4243bf5a3..b6d68657e680d2275d9e7d290aede91ac06f6d69 100644 (file)
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -98,7 +98,7 @@ tzset (void)
    causes problems.  */
 
 int
-gettimeofday (struct timeval *restrict tv, void *restrict tz)
+rpl_gettimeofday (struct timeval *restrict tv, void *restrict tz)
 {
 #undef gettimeofday
 #if HAVE_GETTIMEOFDAY

diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4
index 9f70e10ef561cddf662d5656d8779d1027f26cf3..ec533594d19a098d7878e899245884e254dea674 100644 (file)
--- a/m4/gettimeofday.m4
+++ b/m4/gettimeofday.m4
@@ -1,4 +1,4 @@
-#serial 9
+#serial 10
 
 # Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -90,6 +90,8 @@ AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [
     [Define to rpl_gmtime if the replacement function should be used.])
   AC_DEFINE([localtime], [rpl_localtime],
     [Define to rpl_localtime if the replacement function should be used.])
+  AC_DEFINE([gettimeofday], [rpl_gettimeofday],
+    [Define to rpl_gettimeofday if the replacement function should be used.])
 ])
 
 # Prerequisites of lib/gettimeofday.c.