[glib/glib-2-64: 2/2] Merge branch 'backport-1420-gmacros-cpp-glib-2-64' into 'glib-2-64'

[Simon McVittie <smcv src gnome org>]

commit 9d46d9d457409536b3383915bea0f08a9a681540
Merge: d87597158 ce8e0aa4b
Author: Simon McVittie <simon mcvittie collabora co uk>
Date:   Wed Mar 18 10:23:08 2020 +0000

    Merge branch 'backport-1420-gmacros-cpp-glib-2-64' into 'glib-2-64'
    
    Backport !1420 “gmacros.h: avoid using _Static_assert in C++17 mode” to glib-2-64
    
    See merge request GNOME/glib!1421

 glib/gmacros.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---