Merge branch 'wip/chergert/volatile-fixes' into 'master'

types: fix various use of volatile in type registration

See merge request GNOME/gtk!2865

4 files changed, 4 insertions, 4 deletions

diff --git a/gsk/gskdebug.c b/gsk/gskdebug.c
index 4e197257ef..83a3619fe7 100644
--- a/gsk/gskdebug.c
+++ b/gsk/gskdebug.c
@@ -22,7 +22,7 @@ static guint gsk_debug_flags;
 static void
 init_debug_flags (void)
 {
-  static volatile gsize gsk_debug_flags__set;
+  static gsize gsk_debug_flags__set;
 
   if (g_once_init_enter (&gsk_debug_flags__set))
     {
diff --git a/gsk/gskenumtypes.c.template b/gsk/gskenumtypes.c.template
index 5aa13fe70e..ae1d0de501 100644
--- a/gsk/gskenumtypes.c.template
+++ b/gsk/gskenumtypes.c.template
@@ -13,7 +13,7 @@
 GType
 @enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize g_define_type_id__volatile = 0;
 
   if (g_once_init_enter (&g_define_type_id__volatile))
     {
diff --git a/gsk/gskrendernode.c b/gsk/gskrendernode.c
index 92dfc77e2f..f0980ba369 100644
--- a/gsk/gskrendernode.c
+++ b/gsk/gskrendernode.c
@@ -184,7 +184,7 @@ gsk_render_node_init (GskRenderNode *self)
 GType
 gsk_render_node_get_type (void)
 {
-  static volatile gsize render_node_type__volatile;
+  static gsize render_node_type__volatile;
 
   if (g_once_init_enter (&render_node_type__volatile))
     {
diff --git a/gsk/gskrendernodeimpl.c b/gsk/gskrendernodeimpl.c
index acc6f529a1..fb6c659baf 100644
--- a/gsk/gskrendernodeimpl.c
+++ b/gsk/gskrendernodeimpl.c
@@ -5649,7 +5649,7 @@ gsk_render_node_init_types_once (void)
 void
 gsk_render_node_init_types (void)
 {
-  static volatile gsize register_types__volatile;
+  static gsize register_types__volatile;
 
   if (g_once_init_enter (&register_types__volatile))
     {