Merge branch 'cancellable-disable-assert' into 'master'

gcancellable: Mark a variable as unused if built with G_DISABLE_ASSERT

See merge request GNOME/glib!1635
This commit is contained in:
Simon McVittie 2020-09-01 13:55:48 +00:00
commit bdcf193c2e

View File

@ -349,7 +349,7 @@ g_cancellable_get_fd (GCancellable *cancellable)
{
GPollFD pollfd;
#ifndef G_OS_WIN32
gboolean retval;
gboolean retval G_GNUC_UNUSED /* when compiling with G_DISABLE_ASSERT */;
#endif
if (cancellable == NULL)