[glib: 2/2] Merge branch 'allomix302-master-patch-38827' into 'master'

[Philip Withnall <pwithnall src gnome org>]

commit 95d406cc147e461c14128cf202f65cd5cee42d5c
Merge: f39d4f1fa 514c2d819
Author: Philip Withnall <philip tecnocode co uk>
Date:   Mon May 3 09:37:00 2021 +0000

    Merge branch 'allomix302-master-patch-38827' into 'master'
    
    gmacros: Add __ to noinline to prevent conflict with macro in pixman
    
    Closes #2388
    
    See merge request GNOME/glib!2059

 docs/reference/glib/glib-sections.txt | 2 +-
 glib/gmacros.h                        | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)
---