diff options
author | Andy Polyakov <appro@openssl.org> | 2016-05-26 23:10:56 +0200 |
---|---|---|
committer | Andy Polyakov <appro@openssl.org> | 2016-05-27 23:05:03 +0200 |
commit | 90edbfcce3b84287332ac77f19993cbc18effdef (patch) | |
tree | f6c190f58708e12fd7115b0b3bd961dd0195e82e /include | |
parent | efdb2d6c797112e58e304d3e5300f169dbb16e95 (diff) |
include/openssl/e_os2.h: fix 'noreturn' pre-processor logic.
Newer gcc still recognizes e.g. -std=c9x in which case it wouldn't
have used 'noreturn' at all with original logic.
Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to 'include')
-rw-r--r-- | include/openssl/e_os2.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h index eee632352a..e0a5e46a6b 100644 --- a/include/openssl/e_os2.h +++ b/include/openssl/e_os2.h @@ -293,10 +293,10 @@ typedef unsigned __int64 uint64_t; # define ossl_inline inline # endif -# if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)) -# define ossl_noreturn __attribute__((noreturn)) -# elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L +# if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L # define ossl_noreturn _Noreturn +# elif defined(__GNUC__) && __GNUC__ >= 2 +# define ossl_noreturn __attribute__((noreturn)) # else # define ossl_noreturn # endif |