[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.11-115-g74719c2

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  8d596a9bc560eb6740e2f303cda712eb7169c3ce (commit)

- Log -----------------------------------------------------------------
74719c2... Fix up overzealous HAVE_LT_DLMUTEX_REGISTER block
-----------------------------------------------------------------------

Summary of changes:
 src/daemon/ltdl-bind-now.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

-----------------------------------------------------------------------

commit 74719c24f561cd04ba430a69a8885e7b4a05edb6
Author: Russ Dill <Russ.Dill at asu.edu>
Date:   Sun Aug 17 12:53:43 2008 -0700

    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 at gmail.com>
    Signed-off-by: Lennart Poettering <lennart at poettering.net>

diff --git a/src/daemon/ltdl-bind-now.c b/src/daemon/ltdl-bind-now.c
index 4007724..bb5a196 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
 
 /*

-- 
hooks/post-receive
PulseAudio Sound Server