Commit 9cb16e8f authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

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

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

This reverts commit 3b6ed808.
parent 19e9de43
......@@ -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 )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment