[vlc-commits] commit: Remove CPP contradiction from [5a005c66] ( Rémi Denis-Courmont )

git at videolan.org git at videolan.org
Mon Aug 2 19:47:37 CEST 2010


vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Aug  2 20:47:20 2010 +0300| [6de554efe1c224a46bb07f90c305295e04c2a08a] | committer: Rémi Denis-Courmont 

Remove CPP contradiction from [5a005c66]

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6de554efe1c224a46bb07f90c305295e04c2a08a
---

 src/misc/mtime.c |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 940505d..7341a66 100644
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -235,12 +235,6 @@ mtime_t mdate( void )
 
     res = (d.quot * 1000000) + ((d.rem * 1000000) / freq.QuadPart);
 
-#elif defined(USE_APPLE_MACH)
-    /* The version that should be used, if it was cancelable */
-    pthread_once(&mtime_timebase_info_once, mtime_init_timebase);
-    uint64_t mach_time = date * 1000 * mtime_timebase_info.denom / mtime_timebase_info.numer;
-    mach_wait_until(mach_time);
-
 #else
     struct timeval tv_date;
 



More information about the vlc-commits mailing list