diff options
author | Yabin Cui <yabinc@google.com> | 2015-03-17 11:34:57 -0700 |
---|---|---|
committer | Yabin Cui <yabinc@google.com> | 2015-03-17 11:37:51 -0700 |
commit | ecbfb25c504b7360d250c849ab47890ad54b6125 (patch) | |
tree | 916d3348f1b9ef4192f754f71ce422994370d44a | |
parent | 94babaee1b6598b15bd807461055d4dcaaa52f10 (diff) | |
download | bionic-ecbfb25c504b7360d250c849ab47890ad54b6125.zip bionic-ecbfb25c504b7360d250c849ab47890ad54b6125.tar.gz bionic-ecbfb25c504b7360d250c849ab47890ad54b6125.tar.bz2 |
Fix build: pthread_mutex/pthread_detach.
Change-Id: I9c7b6297d3bf3ab8004d05d44cc4c95159315c9e
-rw-r--r-- | libc/bionic/pthread_detach.cpp | 4 | ||||
-rw-r--r-- | 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 0712d0d..7ae5eb4 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 f110782..24066ae 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; } |