summaryrefslogtreecommitdiffstats
path: root/libc/include
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2014-10-07 16:02:11 -0700
committerElliott Hughes <enh@google.com>2014-10-07 16:02:11 -0700
commit7d3f553f989f830976efa92ddc3c84661d4d42aa (patch)
treecb8560d4abe6a37b4e45ca577e579d182d42aa6a /libc/include
parenteeb9aa02b7f307a1d9b80731dd69ef9dd2f47e47 (diff)
downloadbionic-7d3f553f989f830976efa92ddc3c84661d4d42aa.zip
bionic-7d3f553f989f830976efa92ddc3c84661d4d42aa.tar.gz
bionic-7d3f553f989f830976efa92ddc3c84661d4d42aa.tar.bz2
Work around a bug in Immersion's libImmEmulatorJ.so.
This library calls pthread_mutex_lock and pthread_mutex_unlock with a NULL pthread_mutex_t*. This gives them (and their users) one release to fix things. Bug: 17443936 Change-Id: I3b63c9a3dd63db0833f21073e323b3236a13b47a
Diffstat (limited to 'libc/include')
-rw-r--r--libc/include/pthread.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libc/include/pthread.h b/libc/include/pthread.h
index 86a1005..c32890b 100644
--- a/libc/include/pthread.h
+++ b/libc/include/pthread.h
@@ -206,10 +206,10 @@ int pthread_mutexattr_settype(pthread_mutexattr_t*, int) __nonnull((1));
int pthread_mutex_destroy(pthread_mutex_t*) __nonnull((1));
int pthread_mutex_init(pthread_mutex_t*, const pthread_mutexattr_t*) __nonnull((1));
-int pthread_mutex_lock(pthread_mutex_t*) __nonnull((1));
+int pthread_mutex_lock(pthread_mutex_t*) /* __nonnull((1)) */;
int pthread_mutex_timedlock(pthread_mutex_t*, const struct timespec*) __nonnull((1, 2));
int pthread_mutex_trylock(pthread_mutex_t*) __nonnull((1));
-int pthread_mutex_unlock(pthread_mutex_t*) __nonnull((1));
+int pthread_mutex_unlock(pthread_mutex_t*) /* __nonnull((1)) */;
int pthread_once(pthread_once_t*, void (*)(void)) __nonnull((1, 2));