Merge branch 'nacho/gmacros-master2' into 'master'

gmacros: missing check if __STDC_VERSION__ is defined

See merge request GNOME/glib!2067
This commit is contained in:
Sebastian Dröge 2021-04-27 11:36:57 +00:00
commit 232d008ec8

View File

@ -1051,7 +1051,7 @@
#elif (defined (__cplusplus) && __cplusplus >= 201103 && !(__GNUC__ == 4 && __GNUC_MINOR__ == 7)) || defined (_MSC_VER) && (_MSC_VER >= 1900)
# define G_NORETURN [[noreturn]]
/* Use ISO C11 syntax when the compiler supports it. */
#elif __STDC_VERSION__ >= 201112 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
#elif (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112) || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7)
# define G_NORETURN _Noreturn
#else
# define G_NORETURN /* empty */