From cb905b58f068ba68ca8f6645b2c4e9b51ec61e3e Mon Sep 17 00:00:00 2001 From: David Zeuthen Date: Mon, 23 Oct 2006 17:25:52 +0000 Subject: 2006-10-23 David Zeuthen * dbus/dbus-memory.c: Use atomic variable to protect n_blocks_outstanding otherwise OOM will be reported using SMP on some arches * bus/dispatch.c: Add missing end of line characters * bus/desktop-file.c (parse_section_start, parse_key_value) (bus_desktop_file_load): Propertly handle OOM * dbus/dbus-threads.c (init_uninitialized_locks): Check that thread_init_generation equals _dbus_current_generation, not 0 --- dbus/dbus-threads.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'dbus/dbus-threads.c') diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c index 1fbf48b6..a1f3357b 100644 --- a/dbus/dbus-threads.c +++ b/dbus/dbus-threads.c @@ -350,7 +350,7 @@ init_uninitialized_locks (void) { DBusList *link; - _dbus_assert (thread_init_generation == 0); + _dbus_assert (thread_init_generation == _dbus_current_generation); link = uninitialized_mutex_list; while (link != NULL) -- cgit