diff options
| author | Sebastian Dröge <slomo@coaxion.net> | 2021-04-27 11:36:57 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@coaxion.net> | 2021-04-27 11:36:57 +0000 |
| commit | 232d008ec8e126fbe02fface01c56cbb2b145fb3 (patch) | |
| tree | 393bcbefc3e4aad42fa3dd259178f7e1c23d70c5 | |
| parent | 3e2f31c8584565eac09b50e4269801cfb720f52c (diff) | |
| parent | 03e614e6d5540079b6758eded0e9f8d79c116070 (diff) | |
| download | glib-232d008ec8e126fbe02fface01c56cbb2b145fb3.tar.gz | |
Merge branch 'nacho/gmacros-master2' into 'master'
gmacros: missing check if __STDC_VERSION__ is defined
See merge request GNOME/glib!2067
| -rw-r--r-- | glib/gmacros.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/glib/gmacros.h b/glib/gmacros.h index 5b3b265c2..286f1307d 100644 --- a/glib/gmacros.h +++ b/glib/gmacros.h @@ -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 */ |