[gtk: 2/2] Merge branch 'wip/chergert/volatile-fixes' into 'master'

[Timm Bäder <baedert src gnome org>]

commit 108933b655160efc4a9795906d01b81f78ddb62c
Merge: 0fcf01ddd5 0d2ea14ac1
Author: Timm Bäder <mail baedert org>
Date:   Tue Dec 29 07:49:12 2020 +0000

    Merge branch 'wip/chergert/volatile-fixes' into 'master'
    
    types: fix various use of volatile in type registration
    
    See merge request GNOME/gtk!2865

 gdk/gdkenumtypes.c.template           | 2 +-
 gdk/gdkevents.c                       | 6 +++---
 gsk/gskdebug.c                        | 2 +-
 gsk/gskenumtypes.c.template           | 2 +-
 gsk/gskrendernode.c                   | 2 +-
 gsk/gskrendernodeimpl.c               | 2 +-
 gtk/css/gtkcssenumtypes.c.template    | 2 +-
 gtk/gtkexpression.c                   | 6 +++---
 gtk/gtkprintoperation-win32.c         | 2 +-
 gtk/gtkprivatetypebuiltins.c.template | 2 +-
 gtk/gtktypebuiltins.c.template        | 2 +-
 11 files changed, 15 insertions(+), 15 deletions(-)
---