diff options
| author | Havoc Pennington <hp@redhat.com> | 2005-02-24 18:37:16 +0000 |
|---|---|---|
| committer | Havoc Pennington <hp@redhat.com> | 2005-02-24 18:37:16 +0000 |
| commit | cc73b3da32ff6d4bebe9013b812f2845ad282cf7 (patch) | |
| tree | 6c82eeaeaeb65911a2de97688660f5d4e6a15d71 /dbus/dbus-server-protected.h | |
| parent | 54a2e9f7961b4b8afff94bb0c5b756f986965be6 (diff) | |
2005-02-24 Havoc Pennington <hp@redhat.com>
* 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
Diffstat (limited to 'dbus/dbus-server-protected.h')
| -rw-r--r-- | dbus/dbus-server-protected.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/dbus/dbus-server-protected.h b/dbus/dbus-server-protected.h index 5862c6c2..284d02c5 100644 --- a/dbus/dbus-server-protected.h +++ b/dbus/dbus-server-protected.h @@ -25,6 +25,7 @@ #include <config.h> #include <dbus/dbus-internals.h> +#include <dbus/dbus-threads-internal.h> #include <dbus/dbus-server.h> #include <dbus/dbus-timeout.h> #include <dbus/dbus-watch.h> @@ -125,14 +126,14 @@ void _dbus_server_unref_unlocked (DBusServer *server); #define SERVER_LOCK(server) do { \ if (TRACE_LOCKS) { _dbus_verbose (" LOCK: %s\n", _DBUS_FUNCTION_NAME); } \ - dbus_mutex_lock ((server)->mutex); \ + _dbus_mutex_lock ((server)->mutex); \ TOOK_LOCK_CHECK (server); \ } while (0) #define SERVER_UNLOCK(server) do { \ if (TRACE_LOCKS) { _dbus_verbose (" UNLOCK: %s\n", _DBUS_FUNCTION_NAME); } \ RELEASING_LOCK_CHECK (server); \ - dbus_mutex_unlock ((server)->mutex); \ + _dbus_mutex_unlock ((server)->mutex); \ } while (0) DBUS_END_DECLS |