diff options
| author | Simon McVittie <smcv@collabora.com> | 2018-12-17 10:28:07 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2018-12-17 10:28:07 +0000 |
| commit | 95797dc99a17cce23de26a9044cdb3cda569409b (patch) | |
| tree | 1fb2201b591a0fa43c2c6ed350af84978147fcc1 /dbus | |
| parent | c3f401a6739b9374bb24c61beaa8988d80824330 (diff) | |
| parent | 83034f38bea7b6c8ccbe71fa572365f0649928c2 (diff) | |
| download | dbus-95797dc99a17cce23de26a9044cdb3cda569409b.tar.gz | |
Merge branch 'remove-threads-init-debug' into 'master'
_dbus_threads_init_debug: Remove
See merge request dbus/dbus!72
Diffstat (limited to 'dbus')
| -rw-r--r-- | dbus/dbus-internals.h | 3 | ||||
| -rw-r--r-- | dbus/dbus-test.c | 3 | ||||
| -rw-r--r-- | dbus/dbus-threads.c | 6 |
3 files changed, 0 insertions, 12 deletions
diff --git a/dbus/dbus-internals.h b/dbus/dbus-internals.h index 04bb8a8c..2e84f4f9 100644 --- a/dbus/dbus-internals.h +++ b/dbus/dbus-internals.h @@ -406,9 +406,6 @@ void _dbus_unlock (DBusGlobalLock lock); #define _DBUS_UNLOCK(name) _dbus_unlock (_DBUS_LOCK_##name) DBUS_PRIVATE_EXPORT -dbus_bool_t _dbus_threads_init_debug (void); - -DBUS_PRIVATE_EXPORT dbus_bool_t _dbus_address_append_escaped (DBusString *escaped, const DBusString *unescaped); diff --git a/dbus/dbus-test.c b/dbus/dbus-test.c index ae0b791c..6342a41c 100644 --- a/dbus/dbus-test.c +++ b/dbus/dbus-test.c @@ -90,9 +90,6 @@ void _dbus_run_tests (const char *test_data_dir, const char *specific_test) { - if (!_dbus_threads_init_debug ()) - _dbus_test_fatal ("debug threads init failed"); - if (test_data_dir == NULL) test_data_dir = _dbus_getenv ("DBUS_TEST_DATA"); diff --git a/dbus/dbus-threads.c b/dbus/dbus-threads.c index 12d40493..766bacb6 100644 --- a/dbus/dbus-threads.c +++ b/dbus/dbus-threads.c @@ -445,10 +445,4 @@ dbus_threads_init_default (void) #ifdef DBUS_ENABLE_EMBEDDED_TESTS -dbus_bool_t -_dbus_threads_init_debug (void) -{ - return dbus_threads_init (NULL); -} - #endif /* DBUS_ENABLE_EMBEDDED_TESTS */ |