luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 07:26:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

glib: Mark various macros as available in certain versions of GLib

Browse Source 
These macros wrap functions which were only introduced in certain
versions of GLib. The functions are correctly marked as introduced in
those versions, but the macros aren’t, which can result in not getting
appropriate deprecation warnings if you’re using those APIs when you
have said you’re targeting older GLib versions using
`GLIB_VERSION_MAX_ALLOWED`.

Signed-off-by: Philip Withnall <withnall@endlessm.com>

Closes: #1860
This commit is contained in:
Philip Withnall 2019-08-26 18:50:16 +03:00
parent 9c34be6972
commit d196bfa4a4
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
glib/gmain.h
View File

@ -619,7 +619,8 @@ void g_clear_handle_id (guint *tag_ptr,
*_tag_ptr = 0; \ *_tag_ptr = 0; \
clear_func (_handle_id); \ clear_func (_handle_id); \
} \ } \
} G_STMT_END } G_STMT_END \
GLIB_AVAILABLE_MACRO_IN_2_56
/* Idles, child watchers and timeouts */ /* Idles, child watchers and timeouts */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL

6
glib/gmem.h
View File

@ -119,7 +119,8 @@ gpointer g_try_realloc_n (gpointer mem,
*_pp = NULL; \ *_pp = NULL; \
if (_ptr) \ if (_ptr) \
(destroy) (_ptr); \ (destroy) (_ptr); \
} G_STMT_END } G_STMT_END \
GLIB_AVAILABLE_MACRO_IN_2_34
#else /* __GNUC__ */ #else /* __GNUC__ */
#define g_clear_pointer(pp, destroy) \ #define g_clear_pointer(pp, destroy) \
G_STMT_START { \ G_STMT_START { \
@ -137,7 +138,8 @@ gpointer g_try_realloc_n (gpointer mem,
*_pp.out = NULL; \ *_pp.out = NULL; \
_destroy (_p); \ _destroy (_p); \
} \ } \
} G_STMT_END } G_STMT_END \
GLIB_AVAILABLE_MACRO_IN_2_34
#endif /* __GNUC__ */ #endif /* __GNUC__ */
/** /**

3
gobject/gsignal.h
View File

@ -450,7 +450,8 @@ void g_clear_signal_handler (gulong *handler_id_ptr,
g_signal_handler_disconnect ((instance), _handler_id); \ g_signal_handler_disconnect ((instance), _handler_id); \
*(handler_id_ptr) = 0; \ *(handler_id_ptr) = 0; \
} \ } \
} G_STMT_END } G_STMT_END \
GLIB_AVAILABLE_MACRO_IN_2_62
/* --- overriding and chaining --- */ /* --- overriding and chaining --- */
GLIB_AVAILABLE_IN_ALL GLIB_AVAILABLE_IN_ALL