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

am e8d9057e: Merge "Work around a bug in Immersion\'s libImmEmulatorJ.so."

Browse Source 
* commit 'e8d9057e3005f6f53f8ef2e876b43aea7a892292':
  Work around a bug in Immersion's libImmEmulatorJ.so.
This commit is contained in:
Elliott Hughes 2014-10-07 23:20:57 +00:00 committed by Android Git Automerger
commit e698a7b5cf
2 changed files with 14 additions and 2 deletions
Show Stats 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) {
#if !defined(__LP64__)
if (mutex == NULL) {
return EINVAL;
}
#endif
int mvalue, mtype, tid, shared;
mvalue = mutex->value;
@ -526,6 +532,12 @@ int pthread_mutex_lock(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;
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_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));