luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-11-11 20:06:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'gmacros-gnoreturn-cleanup' into 'master'

Browse Source 
gmacros.h: G_NORETURN: remove useless checks

See merge request GNOME/glib!2099
This commit is contained in:
Philip Withnall 2021-05-11 22:26:44 +00:00
commit 940613e598
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glib/gmacros.h
View File

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