[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  f3ac964ba431c91b3a8b47f2ad2e82ee52fcc5ff (commit)
      from  a699b8e4ca106a1aade0cc741eca63a61d44b90f (commit)


- Log -----------------------------------------------------------------
commit f3ac964ba431c91b3a8b47f2ad2e82ee52fcc5ff
Author: Richard Levitte <levitte at openssl.org>
Date:   Fri Feb 9 13:45:58 2018 +0100

    Turn off printf format checking for BIO_printf et al on Mac OS/X
    
    Mac OS/X has a type for %j that doesn't agree with how we define it,
    which gives incorrect warnings.  The easiest way out of that situation
    is simply to turn off that check on Mac OS/X.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/5302)

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

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

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 54a833c..d8d8ac4 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -735,7 +735,8 @@ void BIO_copy_next_retry(BIO *b);
  */
 
 # define __bio_h__attr__(x)
-# if defined(__GNUC__) && defined(__STDC_VERSION__)
+# if defined(__GNUC__) && defined(__STDC_VERSION__) \
+    && !defined(__APPLE__)
     /*
      * Because we support the 'z' modifier, which made its appearance in C99,
      * we can't use __attribute__ with pre C99 dialects.