[glib: 2/2] Merge branch 'nacho/gmacros-master' into 'master'

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

commit 365314b37a12f1f40dca9447b92b5b27919d81d0
Merge: 80a938a20 2c97526c0
Author: Sebastian Dröge <slomo coaxion net>
Date:   Fri Apr 23 08:39:46 2021 +0000

    Merge branch 'nacho/gmacros-master' into 'master'
    
    gmacros: check that __cplusplus or _MSC_VER is defined
    
    Closes #2387
    
    See merge request GNOME/glib!2061

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