commit 3d773274ad6caaf7e0431c3d5eeb31f727b53d1a
author Elliott Hughes <enh@google.com> Tue Oct 07 23:31:06 2014 +0000
committer Elliott Hughes <enh@google.com> Tue Oct 07 23:31:06 2014 +0000
tree e1f6074157470da7a594f3f3d4300265332f271a
parent 7d3f553f989f830976efa92ddc3c84661d4d42aa

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

This reverts commit 7d3f553f989f830976efa92ddc3c84661d4d42aa.

Change-Id: I8909b6aa1d97e9a61dbe95a2d91b9fbe336b58f0

libc/bionic/pthread_mutex.cpp

diff --git a/libc/bionic/pthread_mutex.cpp b/libc/bionic/pthread_mutex.cpp
index b338e51..cbb6ef7 100644
--- a/libc/bionic/pthread_mutex.cpp
+++ b/libc/bionic/pthread_mutex.cpp
@@ -448,12 +448,6 @@
 }
 
 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;
@@ -532,12 +526,6 @@
 }
 
 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;

libc/include/pthread.h

diff --git a/libc/include/pthread.h b/libc/include/pthread.h
index c32890b..86a1005 100644
--- a/libc/include/pthread.h
+++ b/libc/include/pthread.h
@@ -206,10 +206,10 @@
 
 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));