commit 061332f21643a910941c32cbfc40e577c380e342
author Brian Smith <brian@briansmith.org> Sun Jan 17 09:30:42 2016 -1000
committer David Benjamin <davidben@google.com> Thu Jan 21 20:58:51 2016 +0000
tree 1180cc35ec109cd6546d8d68d4658a28f0e6bf36
parent 0687bdfc12e7ce5832610465d12c69040d1c714b

Define |OPENSSL_PRINTF_FORMAT_FUNC| for format string annotations.

This centralizes the conditional logic into openssl/base.h so that it
doesn't have to be repeated. The name |OPENSSL_PRINTF_FORMAT_FUNC| was
chosen in anticipation of eventually defining an
|OPENSSL_PRINTF_FORMAT_ARG| for MSVC-style parameter annotations.

Change-Id: I273e6eddd209e696dc9f82099008c35b6d477cdb
Reviewed-on: https://boringssl-review.googlesource.com/6909
Reviewed-by: David Benjamin <davidben@google.com>

include/openssl/bio.h

diff --git a/include/openssl/bio.h b/include/openssl/bio.h
index c88a3e1..0c8bfe4 100644
--- a/include/openssl/bio.h
+++ b/include/openssl/bio.h
@@ -312,14 +312,8 @@
  *
  * These functions are versions of printf functions that output to a BIO rather
  * than a FILE. */
-#ifdef __GNUC__
-#define __bio_h__attr__ __attribute__
-#else
-#define __bio_h__attr__(x)
-#endif
 OPENSSL_EXPORT int BIO_printf(BIO *bio, const char *format, ...)
-    __bio_h__attr__((__format__(__printf__, 2, 3)));
-#undef __bio_h__attr__
+    OPENSSL_PRINTF_FORMAT_FUNC(2, 3);
 
 
 /* Utility functions. */