From 7e9fb7ce539b81da280e9114ae6009fe31946534 Mon Sep 17 00:00:00 2001
From: Daemonratte <daemonratte@daemonratte.net>
Date: Thu, 7 May 2026 18:12:16 +0200
Subject: [PATCH] gail: drop volatile from once-init type IDs

---
 modules/other/gail/gailcellparent.c | 10 +++++-----
 modules/other/gail/gailfactory.h    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/modules/other/gail/gailcellparent.c b/modules/other/gail/gailcellparent.c
index 883b7194a..b9abfa945 100644
--- a/modules/other/gail/gailcellparent.c
+++ b/modules/other/gail/gailcellparent.c
@@ -26,11 +26,11 @@
 GType
 gail_cell_parent_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id = 0;
 
-  if (g_once_init_enter (&g_define_type_id__volatile))
+  if (g_once_init_enter (&g_define_type_id))
     {
-      GType g_define_type_id =
+      GType type_id =
         g_type_register_static_simple (G_TYPE_INTERFACE,
                                        "GailCellParent",
                                        sizeof (GailCellParentIface),
@@ -39,10 +39,10 @@ gail_cell_parent_get_type (void)
                                        NULL,
                                        0);
 
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id);
+      g_once_init_leave (&g_define_type_id, type_id);
     }
 
-  return g_define_type_id__volatile;
+  return g_define_type_id;
 }
 
 /**
diff --git a/modules/other/gail/gailfactory.h b/modules/other/gail/gailfactory.h
index d9d222198..7d0e40f4d 100644
--- a/modules/other/gail/gailfactory.h
+++ b/modules/other/gail/gailfactory.h
@@ -62,10 +62,10 @@ type_name##_factory_class_init (AtkObjectFactoryClass *klass) \
 GType \
 type_name##_factory_get_type (void) \
 { \
-  static volatile gsize g_define_type_id__volatile = 0; \
-  if (g_once_init_enter (&g_define_type_id__volatile)) \
+  static gsize g_define_type_id = 0; \
+  if (g_once_init_enter (&g_define_type_id)) \
     { \
-      GType g_define_type_id = \
+      GType type_id = \
         g_type_register_static_simple (ATK_TYPE_OBJECT_FACTORY, \
                                        g_intern_static_string (#TypeName "Factory"), \
                                        sizeof (AtkObjectFactoryClass), \
@@ -73,9 +73,9 @@ type_name##_factory_get_type (void) \
                                        sizeof (AtkObjectFactory), \
                                        (GInstanceInitFunc) NULL, \
                                        (GTypeFlags) 0); \
-      g_once_init_leave (&g_define_type_id__volatile, g_define_type_id); \
+      g_once_init_leave (&g_define_type_id, type_id); \
     } \
-  return g_define_type_id__volatile; \
+  return g_define_type_id; \
 }
 
 /* Implements a AtkObjectFactory creating accessibles of type