commit ae5fdd96484c7eaee858206c1f79722748b8dcc8
author David Benjamin <davidben@chromium.org> Thu May 07 10:42:29 2015 -0400
committer Adam Langley <agl@google.com> Thu May 07 17:25:09 2015 +0000
tree 03c5bf30ba30e180334ec97cfb7ea1c3e4202b4d
parent a24265cfb16c4528759e4148d57a735f39fb7975

Revert "Work around missing PTHREAD_RWLOCK_INITIALIZER in NaCl newlib."

This reverts commit 68de407b5fc746c0fa82706dd897288d01c32930. The NaCl fix has
rolled into Chromium.

Change-Id: I9fd6a6ae727c95fa89b8ce27e301f2a748d0acc9
Reviewed-on: https://boringssl-review.googlesource.com/4651
Reviewed-by: Adam Langley <agl@google.com>

crypto/internal.h

diff --git a/crypto/internal.h b/crypto/internal.h
index 40fcf90..9cb8573 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -369,19 +369,7 @@
 struct CRYPTO_STATIC_MUTEX {
   pthread_rwlock_t lock;
 };
-
-#if !defined(PTHREAD_RWLOCK_INITIALIZER) && defined(__native_client__) && \
-    defined(_NEWLIB_VERSION)
-/* newlib under NaCl is missing PTHREAD_RWLOCK_INITIALIZER. See
- * https://code.google.com/p/nativeclient/issues/detail?id=4160. Remove this
- * when that bug is fixed. */
-#define CRYPTO_STATIC_MUTEX_INIT                                        \
-  { { PTHREAD_MUTEX_INITIALIZER, 0, 0, NACL_PTHREAD_ILLEGAL_THREAD_ID,  \
-      PTHREAD_COND_INITIALIZER, PTHREAD_COND_INITIALIZER } }
-#else
 #define CRYPTO_STATIC_MUTEX_INIT { PTHREAD_RWLOCK_INITIALIZER }
-#endif
-
 #else
 struct CRYPTO_STATIC_MUTEX {
   CRYPTO_once_t once;