The branch master has been updated
via 90edbfcce3b84287332ac77f19993cbc18effdef (commit)
from efdb2d6c797112e58e304d3e5300f169dbb16e95 (commit)
- Log -----------------------------------------------------------------
commit 90edbfcce3b84287332ac77f19993cbc18effdef
Author: Andy Polyakov <[email protected]>
Date: Thu May 26 23:10:56 2016 +0200
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 <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
include/openssl/e_os2.h | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index eee6323..e0a5e46 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
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
