From: Eric Blake <eblake@redhat.com>
Date: Tue, 23 Feb 2010 15:22:04 +0000 (-0700)
Subject: gettimeofday: provide correct function
X-Git-Tag: v0.1~4589
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=7a39fa84206d8d0bb39640895fa48a1c29631b4b;hp=2709233ead439b582d82af48bd25e709378cda44;p=gnulib.git

gettimeofday: provide correct function

* lib/gettimeofday.c (gettimeofday): Provide rpl_gettimeofday only
when replacement is declared, otherwise provide gettimeofday.
Reported by Michael Goffioul.

Signed-off-by: Eric Blake <eblake@redhat.com>
---

diff --git a/ChangeLog b/ChangeLog
index 83ba5a997..9f03e3fc6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-23  Eric Blake  <eblake@redhat.com>
+
+	gettimeofday: provide correct function
+	* lib/gettimeofday.c (gettimeofday): Provide rpl_gettimeofday only
+	when replacement is declared, otherwise provide gettimeofday.
+	Reported by Michael Goffioul.
+
 2010-02-23  Jim Meyering  <meyering@redhat.com>
 
 	lib-ignore: relax license to "unlimited", not LGPLv2+
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index 14304fa38..3c4e3a281 100644
--- a/lib/gettimeofday.c
+++ b/lib/gettimeofday.c
@@ -100,7 +100,7 @@ rpl_tzset (void)
    causes problems.  */
 
 int
-rpl_gettimeofday (struct timeval *restrict tv, void *restrict tz)
+gettimeofday (struct timeval *restrict tv, void *restrict tz)
 {
 #undef gettimeofday
 #if HAVE_GETTIMEOFDAY