From 266e892a5e81ec6193fd5f4c45d15a8d916582a2 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Sun, 25 Aug 2024 17:39:04 +0100 Subject: [PATCH] Revert "gcancellable: Mark assert-only variable as unused" This reverts commit 6c679fb37a0bfeed7beb42d1b1e3590713eac10c. Merge request !2765 has caused a thread safety regression in `GCancellableSource` disposal. It landed too late in the cycle to fix with any confidence before the 2.82 release, so the changes are being reverted for the `glib-2-82` branch and 2.82.0 release. This commit is not problematic, but is built entirely on top of the problematic MR, so has to be reverted. Fixes: #3448 Re-opens: #774, #2309, #2313 --- gio/gcancellable.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gio/gcancellable.c b/gio/gcancellable.c index 27dd06370..abf5878ed 100644 --- a/gio/gcancellable.c +++ b/gio/gcancellable.c @@ -664,7 +664,7 @@ cancellable_source_cancelled (GCancellable *cancellable, { GSource *source = user_data; GCancellableSource *cancellable_source = (GCancellableSource *) source; - gboolean callback_was_not_called G_GNUC_UNUSED; + gboolean callback_was_not_called; g_source_ref (source); g_source_set_ready_time (source, 0);