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

gmacros.h: G_NORETURN: remove useless checks

Browse Source 
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:
Aleksandr Mezin 2021-05-11 22:01:04 +06:00
parent 4cd1a1c03d
commit 55f13da1f5
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 */