[glib: 5/5] Merge branch 'android-warning-fixes' into 'master'

[Simon McVittie <smcv src gnome org>]

commit 35e26151a82466ef60620f13ed05eddb79bbd2ca
Merge: 1bda4db21 8492df9f3
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Wed Oct 9 12:33:00 2019 +0000

    Merge branch 'android-warning-fixes' into 'master'
    
    Fix various compiler warnings on Android
    
    See merge request GNOME/glib!1157

 gio/gdbusaddress.c           | 28 ++++++++++++++++++----------
 gio/inotify/inotify-helper.c |  4 ++--
 gio/tests/gdbus-addresses.c  |  1 +
 glib/gunicollate.c           |  2 +-
 4 files changed, 22 insertions(+), 13 deletions(-)
---