commit b245bc750021ce6d220e71625fca66620cdd1f05
author Yabin Cui <yabinc@google.com> Fri Jun 19 18:40:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jun 19 18:40:59 2015 +0000
tree e7d85467751d4fd93f079400667312687f0038d1
parent 64e9e71cdb7d88397e510e1986d494b797ed3b45
parent 0f455612d3325932a851418634a17a61307948c5

am 0f455612: Merge "Fix flaky test of timer_create_multiple in L." into lollipop-mr1-cts-dev

* commit '0f455612d3325932a851418634a17a61307948c5':
  Fix flaky test of timer_create_multiple in L.

libc/include/pthread.h

diff --git a/libc/include/pthread.h b/libc/include/pthread.h
index c32890b..334cf7a 100644
--- a/libc/include/pthread.h
+++ b/libc/include/pthread.h
@@ -56,6 +56,9 @@
 #define  PTHREAD_RECURSIVE_MUTEX_INITIALIZER   {__PTHREAD_RECURSIVE_MUTEX_INIT_VALUE __RESERVED_INITIALIZER}
 #define  PTHREAD_ERRORCHECK_MUTEX_INITIALIZER  {__PTHREAD_ERRORCHECK_MUTEX_INIT_VALUE __RESERVED_INITIALIZER}
 
+#define  PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP  PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+#define  PTHREAD_ERRORCHECK_MUTEX_INITIALIZER_NP PTHREAD_ERRORCHECK_MUTEX_INITIALIZER
+
 enum {
     PTHREAD_MUTEX_NORMAL = 0,
     PTHREAD_MUTEX_RECURSIVE = 1,