diff options
| author | David 'Digit' Turner <digit@google.com> | 2009-09-23 16:09:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-09-23 16:09:39 -0700 |
| commit | 7e5e9f42706da2f487645a522e907b38fc387910 (patch) | |
| tree | 0434cb0f33820821a4f80c72a555f720dc34f1e1 /libc/bionic/pthread.c | |
| parent | 9641805419d30e8bfa4624cf54f823b7a3a9e320 (diff) | |
| parent | bc10cd2900cdb7fed077163b6a33e0f8572b2b19 (diff) | |
| download | bionic-7e5e9f42706da2f487645a522e907b38fc387910.zip bionic-7e5e9f42706da2f487645a522e907b38fc387910.tar.gz bionic-7e5e9f42706da2f487645a522e907b38fc387910.tar.bz2 | |
am bc10cd29: Fix a typo that resulted in a crash in the boot sequence
Merge commit 'bc10cd2900cdb7fed077163b6a33e0f8572b2b19' into eclair-plus-aosp
* commit 'bc10cd2900cdb7fed077163b6a33e0f8572b2b19':
Fix a typo that resulted in a crash in the boot sequence
Diffstat (limited to 'libc/bionic/pthread.c')
| -rw-r--r-- | libc/bionic/pthread.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libc/bionic/pthread.c b/libc/bionic/pthread.c index 9460c1c..8171aac 100644 --- a/libc/bionic/pthread.c +++ b/libc/bionic/pthread.c @@ -1138,7 +1138,7 @@ __timespec_to_absolute(struct timespec* ts, const struct timespec* abstime, cl ts->tv_sec--; ts->tv_nsec += 1000000000; } - if ((ts->tv_nsec < 0) || (ts->tv_nsec < 0)) + if ((ts->tv_nsec < 0) || (ts->tv_sec < 0)) return -1; return 0; |