According to Eric Blake on 2/23/2010 5:58 AM: >> Thanks. I tried the patch and gettimeofday is not compiled in. However, >> there's still a problem as sys/time.h does declare gettimeofday (not >> rpl_gettimeofday), but gettimeofday.c unconditionally implements >> rpl_gettimeofday. So I know I'll have a problem a link stage. > > Indeed; I'll fix that later today. Apparently newer mingw now provides > gettimeofday, so my cross-compilation testing yesterday never triggered > the case of a system without the function.
Turned out to be simpler than I feared. -- Eric Blake ebl...@redhat.com +1-801-349-2682 Libvirt virtualization library http://libvirt.org
From d9b708938d95c3c31ba1683b4bdd1abbe97930e5 Mon Sep 17 00:00:00 2001
From: Eric Blake <ebl...@redhat.com>
Date: Tue, 23 Feb 2010 08:22:04 -0700
Subject: [PATCH] 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 <ebl...@redhat.com>
---
ChangeLog | 7 +++++++
lib/gettimeofday.c | 2 +-
2 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 42145a5..450aee0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-02-23 Eric Blake <ebl...@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-17 Eric Blake <e...@byu.net>
manywarnings: add more warnings
diff --git a/lib/gettimeofday.c b/lib/gettimeofday.c
index 14304fa..3c4e3a2 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
--
1.6.6.1
signature.asc
Description: OpenPGP digital signature
