From d5bca23eaa93209cd9e2a53cf7384bb983573242 Mon Sep 17 00:00:00 2001 From: Michael Catanzaro Date: Wed, 6 Jan 2021 17:06:25 -0600 Subject: [PATCH] Fix build with GCC 11 See: https://gitlab.gnome.org/GNOME/glib/-/commit/fab561f8d05794329184cd81f9ab9d9d77dcc22a (cherry picked from commit 9b34768fa7fa24243439a815ece671a0b2b020dc) --- common/flatpak-enum-types.c.template | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/common/flatpak-enum-types.c.template b/common/flatpak-enum-types.c.template index 063fd191..5ce936c7 100644 --- a/common/flatpak-enum-types.c.template +++ b/common/flatpak-enum-types.c.template @@ -15,9 +15,9 @@ GType @enum_name@_get_type (void) { - static volatile gsize g_define_type_id__volatile = 0; + static gsize static_g_@type@_type_id = 0; - if (g_once_init_enter (&g_define_type_id__volatile)) + if (g_once_init_enter (&static_g_@type@_type_id)) { static const G@Type@Value values[] = { /*** END value-header ***/ @@ -31,10 +31,10 @@ GType }; GType g_define_type_id = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values); - g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); + g_once_init_leave (&static_g_@type@_type_id, g_define_type_id); } - return g_define_type_id__volatile; + return static_g_@type@_type_id; } /*** END value-tail ***/