From: Derk-Jan Hartman <hartman@videolan.org>
Date: Fri, 20 Feb 2009 14:06:10 +0000 (+0100)
Subject: llvm seems to solve our cancellation issues. Revert "Tentative hack for OSX msleep... 
X-Git-Tag: 1.0.0-pre1~547
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=9cb16e8f71a79a2cd2a012cca0923a3660a6d32c;p=vlc

llvm seems to solve our cancellation issues. Revert "Tentative hack for OSX msleep/mwait cancellation"

This reverts commit 3b6ed8084e27fa27f51d3abdeb37052ea9af38fb.
---

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index 96049e55a4..bc622c1a35 100644
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -350,25 +350,6 @@ void mwait( mtime_t date )
     }
     vlc_testcancel();
 
-#elif defined( __APPLE__ )
-    /* Explicit hack: OSX does not cancel at nanosleep() */
-    struct vlc_mutex_t lock;
-    struct vlc_cond_t  wait;
-
-    vlc_mutex_init (&lock);
-    vlc_cond_init (&wait);
-    vlc_mutex_lock (&lock);
-
-    vlc_cleanup_push (vlc_mutex_destroy, &lock);
-    vlc_cleanup_push (vlc_cond_destroy, &wait);
-    vlc_cleanup_push (vlc_mutex_unlock, &lock);
-
-    vlc_cond_timedwait (&wait, &lock, date);
-
-    vlc_cleanup_run ();
-    vlc_cleanup_run ();
-    vlc_cleanup_run ();
-
 #else
     mtime_t delay = date - mdate();
     if( delay > 0 )
@@ -417,7 +398,7 @@ void msleep( mtime_t delay )
 #elif defined( HAVE_KERNEL_OS_H )
     snooze( delay );
 
-#elif defined( WIN32 ) || defined( UNDER_CE ) || defined( __APPLE__ )
+#elif defined( WIN32 ) || defined( UNDER_CE )
     mwait (mdate () + delay);
 
 #elif defined( HAVE_NANOSLEEP )