Commit b1ad979a authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

Update patches for 2.0.1 bugfix branch

parent c5962b31
From abd4cefb85c74f747b0f6d674d3e39c189bd4b1c Mon Sep 17 00:00:00 2001
From 77bd35387539d7d2d92e61b12f5ef27623683520 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jean-Philippe=20Andr=C3=A9?= <jpeg@videolan.org>
Date: Thu, 2 Jun 2011 15:15:57 +0200
Subject: [PATCH 1/3] Android: add compatibility pthread_cancel
......@@ -18,8 +18,8 @@ Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
configure.ac | 4 +
include/vlc_fixups.h | 25 ++++
lib/error.c | 16 +++
src/posix/thread.c | 25 ++++-
5 files changed, 360 insertions(+), 1 deletions(-)
src/posix/thread.c | 25 +++-
5 files changed, 360 insertions(+), 1 deletion(-)
create mode 100644 compat/pthread_cancel.c
diff --git a/compat/pthread_cancel.c b/compat/pthread_cancel.c
......@@ -410,7 +410,7 @@ index ef2ecdc..441953c 100644
vlc_mutex_unlock (&lock);
}
diff --git a/src/posix/thread.c b/src/posix/thread.c
index 1d0d077..6cfe7a0 100644
index f34620f..efb92b9 100644
--- a/src/posix/thread.c
+++ b/src/posix/thread.c
@@ -146,7 +146,9 @@ void vlc_trace (const char *fn, const char *file, unsigned line)
......@@ -436,9 +436,9 @@ index 1d0d077..6cfe7a0 100644
VLC_THREAD_ASSERT ("waiting on condition");
}
@@ -465,7 +471,12 @@ int vlc_cond_timedwait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex,
#endif
@@ -451,7 +457,12 @@ int vlc_cond_timedwait (vlc_cond_t *p_condvar, vlc_mutex_t *p_mutex,
mtime_t deadline)
{
struct timespec ts = mtime_to_ts (deadline);
+
+#ifdef __ANDROID__
......@@ -449,7 +449,7 @@ index 1d0d077..6cfe7a0 100644
if (val != ETIMEDOUT)
VLC_THREAD_ASSERT ("timed-waiting on condition");
return val;
@@ -504,6 +515,14 @@ void vlc_sem_destroy (vlc_sem_t *sem)
@@ -490,6 +501,14 @@ void vlc_sem_destroy (vlc_sem_t *sem)
val = errno;
#endif
......@@ -464,7 +464,7 @@ index 1d0d077..6cfe7a0 100644
VLC_THREAD_ASSERT ("destroying semaphore");
}
@@ -734,7 +753,11 @@ static int vlc_clone_attr (vlc_thread_t *th, pthread_attr_t *attr,
@@ -720,7 +739,11 @@ static int vlc_clone_attr (vlc_thread_t *th, pthread_attr_t *attr,
assert (ret == 0); /* fails iif VLC_STACKSIZE is invalid */
#endif
......@@ -477,5 +477,5 @@ index 1d0d077..6cfe7a0 100644
pthread_attr_destroy (attr);
return ret;
--
1.7.9.1
1.7.9.2
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