[glib: 2/2] Merge branch '1755-revert-gstrfunc' into 'master'

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

commit 009505600802db462be8f1d419d0c8a8ec078fc7
Merge: 22d4a44cd 191670054
Author: Sebastian Dröge <slomo coaxion net>
Date:   Thu May 2 12:24:15 2019 +0000

    Merge branch '1755-revert-gstrfunc' into 'master'
    
    Revert "macros: Try to use the standard __func__ first in G_STRFUNC"
    
    Closes #1755
    
    See merge request GNOME/glib!799

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