From: Mat <mberchtold@gmail.com>
Date: Wed, 18 May 2016 21:30:52 +0000 (+0200)
Subject: Fixes non __GNUC__ compilation
X-Git-Tag: OpenSSL_1_1_0-pre6~774
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=276fa9bda99d12666441277afa39f81ae374437d;p=oweals%2Fopenssl.git

Fixes non __GNUC__ compilation

adds missing check for defined(__GNUC__)
Reviewed-by: Richard Levitte <levitte@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1094)
---

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index 1b1364dc0a..eee632352a 100644
--- a/include/openssl/e_os2.h
+++ b/include/openssl/e_os2.h
@@ -293,7 +293,7 @@ typedef unsigned __int64 uint64_t;
 #  define ossl_inline inline
 # endif
 
-# if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7)
+# if defined(__GNUC__) && (__GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 7))
 #  define ossl_noreturn __attribute__((noreturn))
 # elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
 #  define ossl_noreturn _Noreturn