generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

am b5e7eba6: Work around a bug in Immersion\'s libImmEmulatorJ.so.

Browse Source 
* commit 'b5e7eba6d1b97e471996fcfe7dbde7cbba7512ef':
  Work around a bug in Immersion's libImmEmulatorJ.so.
This commit is contained in:
Elliott Hughes
2014-10-07 23:22:28 +00:00
committed by Android Git Automerger
parent 9eb0d554ba b5e7eba6d1
commit f6aec38582
2 changed files with 14 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
libc/bionic/pthread_mutex.cpp
View File

@@ -448,6 +448,12 @@ static inline __always_inline int _recursive_increment(pthread_mutex_t* mutex, i
} }
int pthread_mutex_lock(pthread_mutex_t* mutex) { int pthread_mutex_lock(pthread_mutex_t* mutex) {
#if !defined(__LP64__)
if (mutex == NULL) {
return EINVAL;
}
#endif
int mvalue, mtype, tid, shared; int mvalue, mtype, tid, shared;
mvalue = mutex->value; mvalue = mutex->value;
@@ -526,6 +532,12 @@ int pthread_mutex_lock(pthread_mutex_t* mutex) {
} }
int pthread_mutex_unlock(pthread_mutex_t* mutex) { int pthread_mutex_unlock(pthread_mutex_t* mutex) {
#if !defined(__LP64__)
if (mutex == NULL) {
return EINVAL;
}
#endif
int mvalue, mtype, tid, shared; int mvalue, mtype, tid, shared;
mvalue = mutex->value; mvalue = mutex->value;

4
libc/include/pthread.h
View File

@@ -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_destroy(pthread_mutex_t*) __nonnull((1));
int pthread_mutex_init(pthread_mutex_t*, const pthread_mutexattr_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_timedlock(pthread_mutex_t*, const struct timespec*) __nonnull((1, 2));
int pthread_mutex_trylock(pthread_mutex_t*) __nonnull((1)); 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)); int pthread_once(pthread_once_t*, void (*)(void)) __nonnull((1, 2));