From ecbfb25c504b7360d250c849ab47890ad54b6125 Mon Sep 17 00:00:00 2001 From: Yabin Cui Date: Tue, 17 Mar 2015 11:34:57 -0700 Subject: [PATCH] Fix build: pthread_mutex/pthread_detach. Change-Id: I9c7b6297d3bf3ab8004d05d44cc4c95159315c9e --- libc/bionic/pthread_detach.cpp | 4 ++-- libc/bionic/pthread_mutex.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libc/bionic/pthread_detach.cpp b/libc/bionic/pthread_detach.cpp index 0712d0d67..7ae5eb4c6 100644 --- a/libc/bionic/pthread_detach.cpp +++ b/libc/bionic/pthread_detach.cpp @@ -44,9 +44,9 @@ int pthread_detach(pthread_t t) { } switch (old_state) { case THREAD_NOT_JOINED: return 0; - case THREAD_JOINED: return 0; // Already being joined; silently do nothing, like glibc. + case THREAD_JOINED: return 0; // Already being joined; silently do nothing, like glibc. case THREAD_DETACHED: return THREAD_DETACHED; - case THREAD_EXITED_NOT_JOINED: // Call pthread_join out of scope of pthread_accessor. + case THREAD_EXITED_NOT_JOINED: break; // Call pthread_join out of scope of pthread_accessor. } } diff --git a/libc/bionic/pthread_mutex.cpp b/libc/bionic/pthread_mutex.cpp index f1107823e..24066ae02 100644 --- a/libc/bionic/pthread_mutex.cpp +++ b/libc/bionic/pthread_mutex.cpp @@ -305,7 +305,7 @@ static inline int __pthread_normal_mutex_trylock(atomic_int* mutex_value_ptr, in */ static inline int __pthread_normal_mutex_lock(atomic_int* mutex_value_ptr, int shared, const timespec* abs_timeout_or_null, clockid_t clock) { - if (__predict_true(__normal_mutex_trylock(mutex_value_ptr, shared) == 0)) { + if (__predict_true(__pthread_normal_mutex_trylock(mutex_value_ptr, shared) == 0)) { return 0; }