From 0d2e22a5410b19b3206b575359cbe56c54a1d3fb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Sat, 25 Nov 2006 16:06:33 +0000
Subject: [PATCH] Compile fix
---
src/misc/mtime.c | 21 ++-------------------
1 file changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index b32551faf716..b67f3f7d13a3 100644
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -160,7 +160,7 @@ mtime_t mdate( void )
freq = ( QueryPerformanceFrequency( &buf ) &&
(freq == I64C(1193182) || freq == I64C(3579545) ) )
- ? buf : 0;
+ ? buf.QuadPart : 0;
}
if( freq != 0 )
@@ -231,27 +231,10 @@ void mwait( mtime_t date )
clock_nanosleep( CLOCK_REALTIME, TIMER_ABSTIME, &ts, NULL );
#else
- mtime_t usec_time, delay;
-
- usec_time = mdate();
- delay = date - usec_time;
+ mtime_t delay = mdate() - date;
if( delay > 0 )
msleep( delay );
-
- struct timeval tv_date;
- mtime_t delay; /* delay in msec, signed to detect errors */
-
- /* see mdate() about gettimeofday() possible errors */
- gettimeofday( &tv_date, NULL );
-
- /* calculate delay and check if current date is before wished date */
- delay = date - (mtime_t) tv_date.tv_sec * 1000000
- - (mtime_t) tv_date.tv_usec
- - 10000;
-
- if( delay > 0 )
- msleep( delay );
#endif
}
--
GitLab