diff options
| author | Philip Withnall <philip.withnall@collabora.co.uk> | 2015-09-30 17:46:47 +0100 |
|---|---|---|
| committer | Philip Withnall <philip.withnall@collabora.co.uk> | 2015-10-01 09:21:05 +0100 |
| commit | ea3348020da586f20e1a64c9732405e730563616 (patch) | |
| tree | 471f0961124abdfecc0371aed290db4d9dd1937e /tests | |
| parent | 9f10231fc787e4683e896bf35f086906a5b16c03 (diff) | |
| download | libnice-ea3348020da586f20e1a64c9732405e730563616.tar.gz | |
agent: Remove redundant GLIB_CHECK_VERSION macros
We depend on GLib 2.36.0, which is a higher version than any of these
version checks cared about, so they were all trivially true or false.
Reviewed-by: Olivier Crête <olivier.crete@collabora.com>
Differential Revision: https://phabricator.freedesktop.org/D298
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-io-stream-common.c | 5 | ||||
| -rw-r--r-- | tests/test-thread.c | 11 |
2 files changed, 1 insertions, 15 deletions
diff --git a/tests/test-io-stream-common.c b/tests/test-io-stream-common.c index bd0f3b5..efa6160 100644 --- a/tests/test-io-stream-common.c +++ b/tests/test-io-stream-common.c @@ -335,12 +335,7 @@ spawn_thread (const gchar *thread_name, GThreadFunc thread_func, { GThread *thread; -#if !GLIB_CHECK_VERSION(2, 31, 8) - thread = g_thread_create (thread_func, user_data, TRUE, NULL); -#else thread = g_thread_new (thread_name, thread_func, user_data); -#endif - g_assert (thread); return thread; diff --git a/tests/test-thread.c b/tests/test-thread.c index e05738c..7493f97 100644 --- a/tests/test-thread.c +++ b/tests/test-thread.c @@ -289,13 +289,8 @@ int main (void) /* step: run test the first time */ g_debug ("test-thread: TEST STARTS / running test for the 1st time"); -#if !GLIB_CHECK_VERSION(2,31,8) - lthread = g_thread_create (mainloop_thread, lmainloop, TRUE, NULL); - rthread = g_thread_create (mainloop_thread, rmainloop, TRUE, NULL); -#else lthread = g_thread_new ("lthread libnice", mainloop_thread, lmainloop); rthread = g_thread_new ("rthread libnice", mainloop_thread, rmainloop); -#endif g_assert (lthread); g_assert (rthread); @@ -316,13 +311,9 @@ int main (void) nice_agent_attach_recv (ragent, rs_id, 1, rdmainctx, cb_nice_recv, GUINT_TO_POINTER (2)); -#if !GLIB_CHECK_VERSION(2,31,8) - ldthread = g_thread_create (mainloop_thread, ldmainloop, TRUE, NULL); - rdthread = g_thread_create (mainloop_thread, rdmainloop, TRUE, NULL); -#else ldthread = g_thread_new ("ldthread libnice", mainloop_thread, ldmainloop); rdthread = g_thread_new ("rdthread libnice", mainloop_thread, rdmainloop); -#endif + g_assert (ldthread); g_assert (rdthread); |