am f9c5afb1: Merge "Redesign dlopen() locks to be recursive per thread."

* commit 'f9c5afb1f9d8e615ab98774a10bbf117962db66d':
  Redesign dlopen() locks to be recursive per thread.
This commit is contained in:
Jean-Baptiste Queru 2012-02-22 09:54:52 -08:00 committed by Android Git Automerger
commit 62daffe147

View file

@ -42,7 +42,7 @@ static const char *dl_errors[] = {
#define likely(expr) __builtin_expect (expr, 1)
#define unlikely(expr) __builtin_expect (expr, 0)
static pthread_mutex_t dl_lock = PTHREAD_MUTEX_INITIALIZER;
pthread_mutex_t dl_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER;
static void set_dlerror(int err)
{