diff options
| author | Christian Hergert <chergert@redhat.com> | 2020-11-18 19:58:09 -0800 |
|---|---|---|
| committer | Christian Hergert <chergert@redhat.com> | 2020-11-18 20:21:33 -0800 |
| commit | 0d2ea14ac1d0b59588b1bfa60e6e45246496572c (patch) | |
| tree | 0536e92bb86672e6b4981923d44b26bb91e41817 /gdk/gdkevents.c | |
| parent | 7551f85d4cfb0df0cf6adcf882981cc5601288ea (diff) | |
| download | gtk+-0d2ea14ac1d0b59588b1bfa60e6e45246496572c.tar.gz | |
types: fix various use of volatile in type registrationwip/chergert/volatile-fixes
The use of volatile was incorrect in GLib and has been that way for
a long time. Recently however that has changed, and this makes GTK
follow suit to avoid using volatile in the type registration.
See also: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/1719
Combined with the above merge request for GLib, this fixes a large
number of compilation warnings when using Clang.
Diffstat (limited to 'gdk/gdkevents.c')
| -rw-r--r-- | gdk/gdkevents.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gdk/gdkevents.c b/gdk/gdkevents.c index 9cfefd0d39..100fc7ba9e 100644 --- a/gdk/gdkevents.c +++ b/gdk/gdkevents.c @@ -210,7 +210,7 @@ gdk_event_init (GdkEvent *self) GType gdk_event_get_type (void) { - static volatile gsize event_type__volatile; + static gsize event_type__volatile; if (g_once_init_enter (&event_type__volatile)) { @@ -374,7 +374,7 @@ static GType gdk_event_types[GDK_EVENT_LAST]; GType \ type_name ## _get_type (void) \ { \ - static volatile gsize gdk_define_event_type_id__volatile; \ + static gsize gdk_define_event_type_id__volatile; \ if (g_once_init_enter (&gdk_define_event_type_id__volatile)) \ { \ GType gdk_define_event_type_id = \ @@ -453,7 +453,7 @@ gdk_event_init_types_once (void) void gdk_event_init_types (void) { - static volatile gsize event_types__volatile; + static gsize event_types__volatile; if (g_once_init_enter (&event_types__volatile)) { |