Commit 060fda09 authored by Philip Withnall's avatar Philip Withnall

Merge branch 'task-set-name-version' into 'master'

gtask: Only override g_task_set_source_tag() for GLib ≥ 2.60

See merge request !1576
parents 50f8a9d3 bd75c185
Pipeline #198953 failed with stages
in 26 minutes and 32 seconds
......@@ -79,12 +79,14 @@ void g_task_set_name (GTask *task,
const gchar *name);
/* Macro wrapper to set the task name when setting the source tag. */
#if GLIB_VERSION_MIN_REQUIRED >= GLIB_VERSION_2_60
#define g_task_set_source_tag(task, tag) G_STMT_START { \
GTask *_task = (task); \
(g_task_set_source_tag) (_task, tag); \
if (g_task_get_name (_task) == NULL) \
g_task_set_name (_task, G_STRINGIFY (tag)); \
} G_STMT_END
#endif
GLIB_AVAILABLE_IN_2_36
gpointer g_task_get_source_object (GTask *task);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment