mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-11 20:06:18 +01:00
gmacros.h: G_NORETURN: remove useless checks
GCC >= 2.8 and MSVC >= 1200 are already handled by `#if` branches above. So: - `(__GNUC__ == 4 && __GNUC_MINOR__ >= 7)` is always false here - `!(__GNUC__ == 4 && __GNUC_MINOR__ == 7)` is always true - `(_MSC_VER >= 1900)` is always false
This commit is contained in:
parent
4cd1a1c03d
commit
55f13da1f5
@ -1048,10 +1048,10 @@
|
||||
/* Use MSVC specific syntax. */
|
||||
# define G_NORETURN __declspec (noreturn)
|
||||
/* 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]]
|
||||
/* 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
|
||||
#else
|
||||
# define G_NORETURN /* empty */
|
||||
|
Loading…
Reference in New Issue
Block a user