From 5c9b6f0fb01252d704de1bbdf3015dee7f956593 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Tue, 14 Feb 2006 08:14:42 +0000 Subject: [PATCH] DRIGetSecs() would call getsecs() when XFree86LOADER is defined, relying on the wrappers to provide it. Wrapper gone, and getsecs doesn't exist on linux so it now blows up. Fixes it by just calling gettimeofday() in all cases instead. --- ChangeLog | 8 ++++++++ hw/xfree86/dri/dri.c | 4 ---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 795b9babe..67f1f1c18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-02-14 Benjamin Herrenschmidt + + * hw/xfree86/dri/dri.c: (DRIGetSecs): + DRIGetSecs() would call getsecs() when XFree86LOADER is defined, + relying on the wrappers to provide it. Wrapper gone, and getsecs + doesn't exist on linux so it now blows up. Fixes it by just calling + gettimeofday() in all cases instead. + 2006-02-14 Benjamin Herrenschmidt * fb/fbbits.h: diff --git a/hw/xfree86/dri/dri.c b/hw/xfree86/dri/dri.c index 72139dea6..dcd455ce0 100644 --- a/hw/xfree86/dri/dri.c +++ b/hw/xfree86/dri/dri.c @@ -1654,16 +1654,12 @@ DRICopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc) static void DRIGetSecs(long *secs, long *usecs) { -#ifdef XFree86LOADER - getsecs(secs,usecs); -#else struct timeval tv; gettimeofday(&tv, NULL); *secs = tv.tv_sec; *usecs = tv.tv_usec; -#endif } static unsigned long