luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-10 12:55:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
gtask: Only override g_task_set_source_tag() for GLib ≥ 2.60

See merge request GNOME/glib!1576
This commit is contained in:
Philip Withnall 2020-07-25 17:16:44 +00:00
commit 060fda09eb
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/gtask.h
View File

@ -79,12 +79,14 @@ void g_task_set_name (GTask *task,
const gchar *name); const gchar *name);
/* Macro wrapper to set the task name when setting the source tag. */ /* 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 { \ #define g_task_set_source_tag(task, tag) G_STMT_START { \
GTask *_task = (task); \ GTask *_task = (task); \
(g_task_set_source_tag) (_task, tag); \ (g_task_set_source_tag) (_task, tag); \
if (g_task_get_name (_task) == NULL) \ if (g_task_get_name (_task) == NULL) \
g_task_set_name (_task, G_STRINGIFY (tag)); \ g_task_set_name (_task, G_STRINGIFY (tag)); \
} G_STMT_END } G_STMT_END
#endif
GLIB_AVAILABLE_IN_2_36 GLIB_AVAILABLE_IN_2_36
gpointer g_task_get_source_object (GTask *task); gpointer g_task_get_source_object (GTask *task);