[gnome-online-accounts/wip/rishi/gcc-11-drop-volatile: 1/2] goa, goabackend: Silence -Wincompatible-pointer-types with GCC 11




commit e846abd8f37eead05f7312569332bda23401b97a
Author: Debarshi Ray <debarshir gnome org>
Date:   Wed Mar 30 16:01:00 2022 +0200

    goa, goabackend: Silence -Wincompatible-pointer-types with GCC 11
    
    See:
    https://gitlab.gnome.org/GNOME/glib/-/commit/fab561f8d057943291
    https://gitlab.gnome.org/GNOME/glib/-/issues/600
    
    https://gitlab.gnome.org/GNOME/gnome-online-accounts/-/merge_requests/78

 src/goa/goaenumtypes.c.template               | 8 ++++----
 src/goabackend/goabackendenumtypes.c.template | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)
---
diff --git a/src/goa/goaenumtypes.c.template b/src/goa/goaenumtypes.c.template
index 78d4a201..3150fa71 100644
--- a/src/goa/goaenumtypes.c.template
+++ b/src/goa/goaenumtypes.c.template
@@ -12,9 +12,9 @@
 GType
 @enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize static_g_define_type_id = 0;
 
-  if (g_once_init_enter (&g_define_type_id__volatile))
+  if (g_once_init_enter (&static_g_define_type_id))
     {
       static const G@Type@Value values[] = {
 /*** END value-header ***/
@@ -28,10 +28,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_define_type_id, g_define_type_id);
     }
 
-  return g_define_type_id__volatile;
+  return static_g_define_type_id;
 }
 
 /*** END value-tail ***/
diff --git a/src/goabackend/goabackendenumtypes.c.template b/src/goabackend/goabackendenumtypes.c.template
index 7a76459d..6d2651da 100644
--- a/src/goabackend/goabackendenumtypes.c.template
+++ b/src/goabackend/goabackendenumtypes.c.template
@@ -12,9 +12,9 @@
 GType
 @enum_name@_get_type (void)
 {
-  static volatile gsize g_define_type_id__volatile = 0;
+  static gsize static_g_define_type_id = 0;
 
-  if (g_once_init_enter (&g_define_type_id__volatile))
+  if (g_once_init_enter (&static_g_define_type_id))
     {
       static const G@Type@Value values[] = {
 /*** END value-header ***/
@@ -28,10 +28,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_define_type_id, g_define_type_id);
     }
 
-  return g_define_type_id__volatile;
+  return static_g_define_type_id;
 }
 
 /*** END value-tail ***/


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]