commit 0e714a5b41451e84c5ded93a42c9a4b0a9440691
author Elliott Hughes <enh@google.com> Mon Mar 03 16:42:47 2014 -0800
committer Elliott Hughes <enh@google.com> Tue Mar 04 10:27:58 2014 -0800
tree 86e6519cc723fb66a9432193da16b380255c22f7
parent 8e541b12237f597c186820b9e18b059b620bef54

Implement POSIX pthread_mutex_timedlock.

This replaces the non-standard pthread_mutex_lock_timeout_np, which we have
to keep around on LP32 for binary compatibility.

Change-Id: I098dc7cd38369f0c1bec1fac35687fbd27392e00

libc/bionic/pthread_cond.cpp

diff --git a/libc/bionic/pthread_cond.cpp b/libc/bionic/pthread_cond.cpp
index e67afba..e570602 100644
--- a/libc/bionic/pthread_cond.cpp
+++ b/libc/bionic/pthread_cond.cpp
@@ -185,7 +185,7 @@
   timespec* tsp;
 
   if (abstime != NULL) {
-    if (__timespec_to_absolute(&ts, abstime, clock) < 0) {
+    if (__timespec_from_absolute(&ts, abstime, clock) < 0) {
       return ETIMEDOUT;
     }
     tsp = &ts;