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

Revert "Work around a bug in Immersion's libImmEmulatorJ.so."

Browse Source 
This reverts commit 7d3f553f989f830976efa92ddc3c84661d4d42aa.

Change-Id: I8909b6aa1d97e9a61dbe95a2d91b9fbe336b58f0
This commit is contained in:
Elliott Hughes 2014-10-07 23:31:06 +00:00
parent 7d3f553f98
commit 3d773274ad
2 changed files with 2 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libc/bionic/pthread_mutex.cpp
View File

@ -448,12 +448,6 @@ 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;
@ -532,12 +526,6 @@ 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));