diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2020-09-01 13:55:48 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2020-09-01 13:55:48 +0000 |
| commit | bdcf193c2e8da23189cb457026c7469a8f8e6369 (patch) | |
| tree | f8f18ba1b77a11103f767fed2ca9e68682a189da | |
| parent | 489941242e714a94fdd2f3686846912d5f272d61 (diff) | |
| parent | 30a31b21fba84af758175259bbf654bff39400f6 (diff) | |
| download | glib-bdcf193c2e8da23189cb457026c7469a8f8e6369.tar.gz | |
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
| -rw-r--r-- | gio/gcancellable.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gio/gcancellable.c b/gio/gcancellable.c index 3008ecf6f..00df6998d 100644 --- a/gio/gcancellable.c +++ b/gio/gcancellable.c @@ -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) |