You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

27 lines
888 B

  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. Fixes: 8580c081c2 ("dlsym: add support for ALSA_PLUGIN_DIR environment variable")
  7. BugLink: https://github.com/alsa-project/alsa-lib/issues/91
  8. Signed-off-by: Jaroslav Kysela <perex@perex.cz>
  9. ---
  10. src/dlmisc.c | 2 --
  11. 1 file changed, 2 deletions(-)
  12. --- a/src/dlmisc.c
  13. +++ b/src/dlmisc.c
  14. @@ -42,11 +42,9 @@
  15. #ifndef PIC
  16. struct snd_dlsym_link *snd_dlsym_start = NULL;
  17. #endif
  18. -#ifdef DL_ORIGIN_AVAILABLE
  19. static int snd_plugin_dir_set = 0;
  20. static char *snd_plugin_dir = NULL;
  21. #endif
  22. -#endif
  23. #if defined(DL_ORIGIN_AVAILABLE) && defined(HAVE_LIBPTHREAD)
  24. static pthread_mutex_t snd_dlpath_mutex = PTHREAD_MUTEX_INITIALIZER;