[vlc-devel] commit: llvm seems to solve our cancellation issues. Revert "mtime: Make nanosleep a bit more cancelable than what it is on osx." ( Derk-Jan Hartman )

git version control git at videolan.org
Fri Feb 20 15:07:47 CET 2009


vlc | branch: master | Derk-Jan Hartman <hartman at videolan.org> | Fri Feb 20 15:06:32 2009 +0100| [71b7780d5bd9c5f8e6c32a462ef1cec42ee27921] | committer: Derk-Jan Hartman 

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

This reverts commit e1cb28a3a913418ac845c622e0d1647ed0d24d39.

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

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

diff --git a/src/misc/mtime.c b/src/misc/mtime.c
index bc622c1..c3d9abd 100644
--- a/src/misc/mtime.c
+++ b/src/misc/mtime.c
@@ -362,20 +362,6 @@ void mwait( mtime_t date )
 #include "libvlc.h" /* vlc_backtrace() */
 #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.
  *




More information about the vlc-devel mailing list