[glib/glib-2-60: 2/2] Merge branch 'backport-799-func-macro-glib-2-60' into 'glib-2-60'

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

commit acdccff4d24784bc428e3492ff31b86c88a2b0c4
Merge: dbd8193a8 7f7f7e3cc
Author: Sebastian Dröge <slomo coaxion net>
Date:   Mon Jun 10 12:15:55 2019 +0000

    Merge branch 'backport-799-func-macro-glib-2-60' into 'glib-2-60'
    
    Backport !799 “Revert "macros: Try to use the standard __func__ first in G_STRFUNC"” to glib-2-60
    
    See merge request GNOME/glib!899

 glib/gmacros.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
---