am efe1aff0: am b9232c94: Merge "Remove PTHREAD_RECURSIVE_MUTEX_INITIALIZER and PTHREAD_ERRORCHECK_MUTEX_INITIALIZER."

* commit 'efe1aff09daef1b1cbe9d9f37c0922f596f01977':
  Remove PTHREAD_RECURSIVE_MUTEX_INITIALIZER and PTHREAD_ERRORCHECK_MUTEX_INITIALIZER.
This commit is contained in:
Yabin Cui 2015-03-26 16:27:34 +00:00 committed by Android Git Automerger
commit c1033489bf

View File

@ -61,10 +61,6 @@ enum {
#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP { { ((PTHREAD_MUTEX_RECURSIVE & 3) << 14) } }
#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP { { ((PTHREAD_MUTEX_ERRORCHECK & 3) << 14) } }
/* TODO: remove this namespace pollution. */
#define PTHREAD_ERRORCHECK_MUTEX_INITIALIZER PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP
#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
typedef struct {
#if defined(__LP64__)
int32_t __private[12];