[glib: 7/7] Merge branch 'fix_more_warnings' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 0c8740dc838263008da7be68192065ae7e935bed
Merge: 4575c70a6 bf536a5ce
Author: Philip Withnall <philip tecnocode co uk>
Date:   Thu May 27 10:00:28 2021 +0000

    Merge branch 'fix_more_warnings' into 'master'
    
    Fix more warnings
    
    See merge request GNOME/glib!2106

 gio/tests/gdbus-exit-on-close.c |  2 +-
 gio/tests/socket.c              | 14 +++++++-------
 glib/tests/atomic.c             |  4 ++--
 gobject/gtype.c                 |  3 ++-
 tests/slice-threadinit.c        |  2 +-
 5 files changed, 13 insertions(+), 12 deletions(-)
---