summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuss Dill <Russ.Dill@asu.edu>2008-08-17 12:53:43 -0700
committerLennart Poettering <lennart@poettering.net>2008-08-17 22:54:58 +0200
commit74719c24f561cd04ba430a69a8885e7b4a05edb6 (patch)
tree48a916c240c12d6ba7759d55d1a96b6085b7a57c
parent8d596a9bc560eb6740e2f303cda712eb7169c3ce (diff)
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>
-rw-r--r--src/daemon/ltdl-bind-now.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/daemon/ltdl-bind-now.c b/src/daemon/ltdl-bind-now.c
index 40077248..bb5a196e 100644
--- a/src/daemon/ltdl-bind-now.c
+++ b/src/daemon/ltdl-bind-now.c
@@ -57,8 +57,6 @@
static pa_mutex *libtool_mutex = NULL;
-PA_STATIC_TLS_DECLARE_NO_FREE(libtool_tls);
-
static void libtool_lock(void) {
pa_mutex_lock(libtool_mutex);
}
@@ -67,6 +65,10 @@ static void libtool_unlock(void) {
pa_mutex_unlock(libtool_mutex);
}
+#endif
+
+PA_STATIC_TLS_DECLARE_NO_FREE(libtool_tls);
+
static void libtool_set_error(const 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);
}
-#endif
-
#ifdef PA_BIND_NOW
/*