From c920d2257bce8c492af7d1fa75a6c7fef377a308 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Tue, 1 Oct 2024 12:24:30 +0100 Subject: [PATCH] gvariant: Fix unused variables when G_DISABLE_ASSERT is defined MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes commit 9eb9df2396, which I really should have noticed at the time would cause a load of unused variables to be declared if compiled with `G_DISABLE_ASSERT`. That’s what the original `#ifdef`s were to protect against. Signed-off-by: Philip Withnall --- glib/gvarianttypeinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/glib/gvarianttypeinfo.c b/glib/gvarianttypeinfo.c index c1705d887..ca4e96de6 100644 --- a/glib/gvarianttypeinfo.c +++ b/glib/gvarianttypeinfo.c @@ -162,7 +162,7 @@ static void g_variant_type_info_check (const GVariantTypeInfo *info, char container_class) { -#ifdef G_ENABLE_DEBUG +#if defined(G_ENABLE_DEBUG) && !defined(G_DISABLE_ASSERT) g_assert (!container_class || info->container_class == container_class); /* alignment can only be one of these */ @@ -191,7 +191,7 @@ g_variant_type_info_check (const GVariantTypeInfo *info, g_assert (0 <= index && index < 24); g_assert (g_variant_type_info_basic_chars[index][0] != ' '); } -#endif /* G_ENABLE_DEBUG */ +#endif /* G_ENABLE_DEBUG && !G_DISABLE_ASSERT */ } /* < private >