[glib/glib-2-56: 4/4] Merge branch '1465-g-gnuc-malloc-on-glib-2-56' into 'glib-2-56'

[Simon McVittie <smcv src gnome org>]

commit 8ca9c2e3509b8d565de493701f16ac325b73cbc9
Merge: c582b947c 0e10479f8
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Thu Aug 23 09:21:10 2018 +0000

    Merge branch '1465-g-gnuc-malloc-on-glib-2-56' into 'glib-2-56'
    
    Backport G_GNUC_MALLOC fixes from #1465 to glib-2-56
    
    See merge request GNOME/glib!261

 glib/docs.c          | 26 ++++++++++++++++++++------
 glib/gbookmarkfile.h |  6 +++---
 glib/gconvert.h      |  2 +-
 glib/gkeyfile.h      |  8 ++++----
 glib/gmappedfile.h   |  4 ++--
 glib/gslice.h        |  2 +-
 glib/gstrfuncs.h     |  8 ++++----
 7 files changed, 35 insertions(+), 21 deletions(-)
---