* dbus/dbus-dataslot.c (_dbus_data_slot_allocator_alloc):

Change _dbus_abort to _dbus_assert_not_reached because _dbus_abort
        causes compile problems when asserts are turned off
        Keeping _dbus_warn for printing out the message so even if
        asserts are turned off the user gets the messages that something is
        wrong
This commit is contained in:
John (J5) Palmieri 2006-08-14 19:33:20 +00:00
parent c1091cbbd2
commit 5b5da52975
2 changed files with 10 additions and 1 deletions

View file

@ -1,3 +1,12 @@
2006-08-14 John (J5) Palmieri <johnp@redhat.com>
* dbus/dbus-dataslot.c (_dbus_data_slot_allocator_alloc):
Change _dbus_abort to _dbus_assert_not_reached because _dbus_abort
causes compile problems when asserts are turned off
Keeping _dbus_warn for printing out the message so even if
asserts are turned off the user gets the messages that something is
wrong
2006-08-14 John (J5) Palmieri <johnp@redhat.com>
Patches by Kjartan Maraas <kmaraas at gnome dot org>

View file

@ -81,7 +81,7 @@ _dbus_data_slot_allocator_alloc (DBusDataSlotAllocator *allocator,
else if (allocator->lock != mutex)
{
_dbus_warn ("D-Bus threads were initialized after first using the D-Bus library. If your application does not directly initialize threads or use D-Bus, keep in mind that some library or plugin may have used D-Bus or initialized threads behind your back. You can often fix this problem by calling dbus_init_threads() or dbus_g_threads_init() early in your main() method, before D-Bus is used.");
_dbus_abort ();
_dbus_assert_not_reached ("exiting");
}
if (*slot_id_p >= 0)