| Andrew Geissler | 6ce62a2 | 2020-11-30 19:58:47 -0600 | [diff] [blame] | 1 | From ad8c8e5503980295dd8e5e54a6285d2d7e32eb1e Mon Sep 17 00:00:00 2001 |
| 2 | From: Jaroslav Kysela <perex@perex.cz> |
| 3 | Date: Thu, 22 Oct 2020 20:57:32 +0200 |
| 4 | Subject: [PATCH] dlmisc: the snd_plugin_dir_set / snd_plugin_dir must be |
| 5 | declared even for \!DL_ORIGIN_AVAILABLE |
| 6 | |
| 7 | Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable") |
| 8 | BugLink: https://github.com/alsa-project/alsa-lib/issues/91 |
| 9 | Signed-off-by: Jaroslav Kysela <perex@perex.cz> |
| 10 | Upstream-Status: Backport |
| 11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 12 | --- |
| 13 | src/dlmisc.c | 2 -- |
| 14 | 1 file changed, 2 deletions(-) |
| 15 | |
| 16 | diff --git a/src/dlmisc.c b/src/dlmisc.c |
| 17 | index c9517c55..f20eb593 100644 |
| 18 | --- a/src/dlmisc.c |
| 19 | +++ b/src/dlmisc.c |
| 20 | @@ -42,11 +42,9 @@ |
| 21 | #ifndef PIC |
| 22 | struct snd_dlsym_link *snd_dlsym_start = NULL; |
| 23 | #endif |
| 24 | -#ifdef DL_ORIGIN_AVAILABLE |
| 25 | static int snd_plugin_dir_set = 0; |
| 26 | static char *snd_plugin_dir = NULL; |
| 27 | #endif |
| 28 | -#endif |
| 29 | |
| 30 | #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD) |
| 31 | static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER; |