[glib: 3/3] Merge branch 'fix-1487-reversion' into 'master'

[Sebastian Dröge <sdroege src gnome org>]

commit f6d26ba772cc7142678b94b02ab860effa79b8f6
Merge: 85f8efae0 4364c5172
Author: Sebastian Dröge <slomo coaxion net>
Date:   Fri May 15 13:10:03 2020 +0000

    Merge branch 'fix-1487-reversion' into 'master'
    
    Fix GLIB_UNAVAILABLE_STATIC_INLINE declaration
    
    See merge request GNOME/glib!1496

 docs/reference/glib/glib-sections.txt |  6 ++++++
 docs/reference/meson.build            |  4 +++-
 glib/gmacros.h                        |  2 ++
 glib/gmain.h                          |  2 ++
 glib/gmem.h                           |  1 +
 glib/gthread.h                        |  8 ++++++++
 glib/gversionmacros.h                 | 10 ++++++++++
 7 files changed, 32 insertions(+), 1 deletion(-)
---