summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-02-09 13:45:58 +0100
committerRichard Levitte <levitte@openssl.org>2018-02-09 14:06:41 +0100
commitf3ac964ba431c91b3a8b47f2ad2e82ee52fcc5ff (patch)
tree20751c1d9f8192ef5ec576188f9a1cd5848fe02e /include
parenta699b8e4ca106a1aade0cc741eca63a61d44b90f (diff)
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@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5302)
Diffstat (limited to 'include')
-rw-r--r--include/openssl/bio.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index 54a833c275..d8d8ac4031 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.