summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid 'Digit' Turner <digit@google.com>2010-02-12 12:18:37 -0800
committerDavid 'Digit' Turner <digit@google.com>2010-02-12 12:18:37 -0800
commit294dd0b86b1484aec7549663aff5b19c98a4b7fd (patch)
tree9a54351833b806c3f31f0b8400c10bd746938254
parent1dcf07a84c93a0095875f2d2087bfe7bfb66a413 (diff)
downloadbionic-294dd0b86b1484aec7549663aff5b19c98a4b7fd.zip
bionic-294dd0b86b1484aec7549663aff5b19c98a4b7fd.tar.gz
bionic-294dd0b86b1484aec7549663aff5b19c98a4b7fd.tar.bz2
Fix sem_trywait() implementation + update changelog.
-rw-r--r--libc/bionic/semaphore.c3
-rw-r--r--libc/docs/CHANGES.TXT9
2 files changed, 10 insertions, 2 deletions
diff --git a/libc/bionic/semaphore.c b/libc/bionic/semaphore.c
index 0c94600..f4eebce 100644
--- a/libc/bionic/semaphore.c
+++ b/libc/bionic/semaphore.c
@@ -196,7 +196,8 @@ int sem_trywait(sem_t *sem)
if (__atomic_dec_if_positive(&sem->count) > 0) {
return 0;
} else {
- return EAGAIN;
+ errno = EAGAIN;
+ return -1;
}
}
diff --git a/libc/docs/CHANGES.TXT b/libc/docs/CHANGES.TXT
index c2655c5..7c8f38c 100644
--- a/libc/docs/CHANGES.TXT
+++ b/libc/docs/CHANGES.TXT
@@ -46,7 +46,14 @@ Differences between current and Android 2.1:
- <wchar.h>: Add mbstowcs() and wcstombs()
-- add clone() implementation for ARM (x86 and SH-4 not working yet)
+- add clone() implementation for ARM (x86 and SH-4 not working yet).
+
+- <sys/epoll.h>: <sys/system_properties.h>: Add missing C++ inclusion guards
+
+- fix getpwnam() and getpwgrp() to accept "app_0" as a valid user name.
+
+- fix sem_trywait() to return -1 and set errno to EAGAIN, instead of
+ returning EAGAIN directly.
-------------------------------------------------------------------------------
Differences between Android 2.1 and 2.0.1: