Commit 71b7780d authored by Derk-Jan Hartman's avatar Derk-Jan Hartman

llvm seems to solve our cancellation issues. Revert "mtime: Make nanosleep a...

llvm seems to solve our cancellation issues. Revert "mtime: Make nanosleep a bit more cancelable than what it is on osx."

This reverts commit e1cb28a3.
parent 9cb16e8f
...@@ -362,20 +362,6 @@ void mwait( mtime_t date ) ...@@ -362,20 +362,6 @@ void mwait( mtime_t date )
#include "libvlc.h" /* vlc_backtrace() */ #include "libvlc.h" /* vlc_backtrace() */
#undef msleep #undef msleep
#if defined(__APPLE__) && defined( HAVE_NANOSLEEP )
/* Mac OS X 10.5's nanosleep is not a cancellation point */
static inline int
semi_testcancelable_nanosleep(const struct timespec *rqtp, struct timespec *rmtp)
{
int ret;
pthread_testcancel();
ret = nanosleep(rqtp, rmtp);
pthread_testcancel();
return ret;
}
#define nanosleep semi_testcancelable_nanosleep
#endif
/** /**
* Portable usleep(). Cancellation point. * Portable usleep(). Cancellation point.
* *
......
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