diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2012-02-22 09:58:17 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-22 09:58:17 -0800 |
| commit | 49a05c060acd4d3e17b2819f00a694271bf40977 (patch) | |
| tree | a5f55a64c5119ba31a0c30e4d61683e8b64d0d8c | |
| parent | 09049311a229c427f73e3e0ac873bf344b45aaf2 (diff) | |
| parent | 62daffe147e8810ce48a897df46b0b3db95ebaa3 (diff) | |
| download | bionic-49a05c060acd4d3e17b2819f00a694271bf40977.zip bionic-49a05c060acd4d3e17b2819f00a694271bf40977.tar.gz bionic-49a05c060acd4d3e17b2819f00a694271bf40977.tar.bz2 | |
am 62daffe1: am f9c5afb1: Merge "Redesign dlopen() locks to be recursive per thread."
* commit '62daffe147e8810ce48a897df46b0b3db95ebaa3':
Redesign dlopen() locks to be recursive per thread.
| -rw-r--r-- | linker/dlfcn.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linker/dlfcn.c b/linker/dlfcn.c index 5964bd1..194a4ae 100644 --- a/linker/dlfcn.c +++ b/linker/dlfcn.c @@ -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) { |