From e421985c0535e827d6dfb9db1ece9c2fd251ed6f Mon Sep 17 00:00:00 2001 From: miod Date: Sun, 1 Jun 2014 11:17:34 +0000 Subject: Remove __bio_h__attr__ wrapper around __attribute__, since earlier statements in this file directly use __attribute__. ok deraadt@ --- lib/libssl/src/crypto/bio/bio.h | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'lib/libssl/src') diff --git a/lib/libssl/src/crypto/bio/bio.h b/lib/libssl/src/crypto/bio/bio.h index 43562d4872d..f5d6e585bf5 100644 --- a/lib/libssl/src/crypto/bio/bio.h +++ b/lib/libssl/src/crypto/bio/bio.h @@ -733,24 +733,18 @@ void BIO_copy_next_retry(BIO *b); /*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/ -#ifdef __GNUC__ -# define __bio_h__attr__ __attribute__ -#else -# define __bio_h__attr__(x) -#endif int BIO_printf(BIO *bio, const char *format, ...) -__bio_h__attr__((__format__(__printf__, 2, 3))); + __attribute__((__format__(__printf__, 2, 3))); int BIO_vprintf(BIO *bio, const char *format, va_list args) -__bio_h__attr__((__format__(__printf__, 2, 0))); + __attribute__((__format__(__printf__, 2, 0))); int BIO_snprintf(char *buf, size_t n, const char *format, ...) -__bio_h__attr__((deprecated, __format__(__printf__, 3, 4))); + __attribute__((deprecated, __format__(__printf__, 3, 4))); int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) -__bio_h__attr__((deprecated, __format__(__printf__, 3, 0))); -#undef __bio_h__attr__ + __attribute__((deprecated, __format__(__printf__, 3, 0))); /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes -- cgit v1.2.3-59-g8ed1b