Index: lock.h
===================================================================
--- lock.h      (revision 36313)
+++ lock.h      (working copy)
@@ -22,11 +22,12 @@
 typedef pthread_mutex_t mutex_t;
 // If this pthread implementation has a static initializer for recursive
 // mutexes, use that, otherwise fall back to the portable version
-#      ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#              define INIT_LOCK(x) x = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
-#      elif defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
-#              define INIT_LOCK(x) x = PTHREAD_RECURSIVE_MUTEX_INITIALIZER
-#      else
+//#    ifdef PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+//#            define INIT_LOCK(x) x = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP
+//#    elif defined(PTHREAD_RECURSIVE_MUTEX_INITIALIZER)
+//#            define INIT_LOCK(x) x = PTHREAD_RECURSIVE_MUTEX_INITIALIZER
+//#    else
+#if 1
 #              define INIT_LOCK(x) init_recursive_mutex(&(x))
 
 static inline void init_recursive_mutex(pthread_mutex_t *x)