mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
Fix up overzealous HAVE_LT_DLMUTEX_REGISTER block
This fixes a built problem on systems without the lt_dlmutex_register function. The overzealousness causes libtool_set_error and libtool_get_error to be undefined. This fixes a build problem on Ubuntu Intrepid. Signed-off-by: Russ Dill <Russ.Dill@gmail.com> Signed-off-by: Lennart Poettering <lennart@poettering.net>
This commit is contained in:
parent
8d596a9bc5
commit
74719c24f5
1 changed files with 4 additions and 4 deletions
|
|
@ -57,8 +57,6 @@
|
||||||
|
|
||||||
static pa_mutex *libtool_mutex = NULL;
|
static pa_mutex *libtool_mutex = NULL;
|
||||||
|
|
||||||
PA_STATIC_TLS_DECLARE_NO_FREE(libtool_tls);
|
|
||||||
|
|
||||||
static void libtool_lock(void) {
|
static void libtool_lock(void) {
|
||||||
pa_mutex_lock(libtool_mutex);
|
pa_mutex_lock(libtool_mutex);
|
||||||
}
|
}
|
||||||
|
|
@ -67,6 +65,10 @@ static void libtool_unlock(void) {
|
||||||
pa_mutex_unlock(libtool_mutex);
|
pa_mutex_unlock(libtool_mutex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
||||||
|
PA_STATIC_TLS_DECLARE_NO_FREE(libtool_tls);
|
||||||
|
|
||||||
static void libtool_set_error(const char *error) {
|
static void libtool_set_error(const char *error) {
|
||||||
PA_STATIC_TLS_SET(libtool_tls, (char*) error);
|
PA_STATIC_TLS_SET(libtool_tls, (char*) error);
|
||||||
}
|
}
|
||||||
|
|
@ -75,8 +77,6 @@ static const char *libtool_get_error(void) {
|
||||||
return PA_STATIC_TLS_GET(libtool_tls);
|
return PA_STATIC_TLS_GET(libtool_tls);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef PA_BIND_NOW
|
#ifdef PA_BIND_NOW
|
||||||
|
|
||||||
/*
|
/*
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue