From cc73b3da32ff6d4bebe9013b812f2845ad282cf7 Mon Sep 17 00:00:00 2001 From: Havoc Pennington Date: Thu, 24 Feb 2005 18:37:16 +0000 Subject: 2005-02-24 Havoc Pennington * dbus/dbus-server.c, dbus/dbus-server-unix.c: change semantics so you must disconnect before unref, since locking and other things are screwed up otherwise. Fix assorted other locking stuff. * dbus/dbus-signature.c (dbus_signature_iter_get_element_type): fix compilation * dbus/dbus-threads-internal.h: move the mutex/condvar wrappers into a private header and don't export from the library * throughout - call _dbus_thread_stuff vs. dbus_thread_stuff --- dbus/dbus-internals.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dbus/dbus-internals.h') diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index be19e1bc..dcbc6183 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -267,8 +267,8 @@ extern int _dbus_current_generation; #define _DBUS_LOCK_NAME(name) _dbus_lock_##name #define _DBUS_DECLARE_GLOBAL_LOCK(name) extern DBusMutex *_dbus_lock_##name #define _DBUS_DEFINE_GLOBAL_LOCK(name) DBusMutex *_dbus_lock_##name -#define _DBUS_LOCK(name) dbus_mutex_lock (_dbus_lock_##name) -#define _DBUS_UNLOCK(name) dbus_mutex_unlock (_dbus_lock_##name) +#define _DBUS_LOCK(name) _dbus_mutex_lock (_dbus_lock_##name) +#define _DBUS_UNLOCK(name) _dbus_mutex_unlock (_dbus_lock_##name) _DBUS_DECLARE_GLOBAL_LOCK (list); _DBUS_DECLARE_GLOBAL_LOCK (connection_slots); -- cgit