From: Jaroslav Kysela <perex@perex.cz>
Date: Thu, 29 Oct 2020 19:31:19 +0000 (+0100)
Subject: dlmisc: fix snd_plugin_dir locking for not DL_ORIGIN_AVAILABLE
X-Git-Tag: v1.2.5~157
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=1d993b37ab4e0b9b6e6b795d7be84ce97b29e20b;p=alsa-lib.git

dlmisc: fix snd_plugin_dir locking for not DL_ORIGIN_AVAILABLE

Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/src/dlmisc.c b/src/dlmisc.c
index f20eb593..1dd91356 100644
--- a/src/dlmisc.c
+++ b/src/dlmisc.c
@@ -46,7 +46,7 @@ static int snd_plugin_dir_set = 0;
 static char *snd_plugin_dir = NULL;
 #endif
 
-#if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
+#ifdef HAVE_LIBPTHREAD
 static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;
 
 static inline void snd_dlpath_lock(void)
@@ -440,12 +440,10 @@ void snd_dlobj_cache_cleanup(void)
 		free(c);
 	}
 	snd_dlobj_unlock();
-#ifdef DL_ORIGIN_AVAILABLE
 	snd_dlpath_lock();
 	snd_plugin_dir_set = 0;
 	free(snd_plugin_dir);
 	snd_plugin_dir = NULL;
 	snd_dlpath_unlock();
-#endif
 }
 #endif