This reverses the relationship between these two functions.
Previously, dbus_threads_init() wouldn't allocate dbus_cond_event_tls
on Windows, call check_monotonic_clock on Unix, or call
_dbus_check_setuid on Unix.
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=54972
Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
Reviewed-by: Alban Crequy <alban.crequy@collabora.co.uk>
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
Applied-upstream: 1.7.4, commit:
eabf6c42a1b779f57f2c08d35772035788657579
Bug-Tizen: TZPC-1971
Change-Id: Ice70cf1f3e2202b72016daf619c89206b96aac47
*/
check_monotonic_clock ();
(void) _dbus_check_setuid ();
- return dbus_threads_init (NULL);
+
+ return TRUE;
}
return FALSE;
}
- return dbus_threads_init (NULL);
+ return TRUE;
}
if (thread_init_generation == _dbus_current_generation)
return TRUE;
- if (!init_locks ())
+ if (!_dbus_threads_init_platform_specific() ||
+ !init_locks ())
return FALSE;
thread_init_generation = _dbus_current_generation;
dbus_bool_t
dbus_threads_init_default (void)
{
- return _dbus_threads_init_platform_specific ();
+ return dbus_threads_init (NULL);
}
dbus_bool_t
_dbus_threads_init_debug (void)
{
- return _dbus_threads_init_platform_specific();
+ return dbus_threads_init (NULL);
}
#endif /* DBUS_BUILD_TESTS */