[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  276fa9bda99d12666441277afa39f81ae374437d (commit)
      from  c9141a43e246d527ec8b5a97b98e93fc31b0f0b8 (commit)


- Log -----------------------------------------------------------------
commit 276fa9bda99d12666441277afa39f81ae374437d
Author: Mat <mberchtold at gmail.com>
Date:   Wed May 18 23:30:52 2016 +0200

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

-----------------------------------------------------------------------

Summary of changes:
 include/openssl/e_os2.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/openssl/e_os2.h b/include/openssl/e_os2.h
index 1b1364d..eee6323 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