[glib: 3/3] Merge branch 'master' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 89c6d64a970e44e0cddb56c9841b762c897442c6
Merge: d981b997c c7d11d341
Author: Philip Withnall <philip tecnocode co uk>
Date:   Fri May 25 13:13:33 2018 +0000

    Merge branch 'master' into 'master'
    
    macros: Double-cast func for g_autolist to avoid warning
    
    Closes #1382 and #1390
    
    See merge request GNOME/glib!8

 glib/gmacros.h       | 6 +++---
 glib/tests/autoptr.c | 6 ++++++
 2 files changed, 9 insertions(+), 3 deletions(-)
---