Remove __bio_h__attr__ wrapper around __attribute__, since earlier statements

in this file directly use __attribute__.

ok deraadt@

2 files changed, 8 insertions, 20 deletions

diff --git a/src/lib/libcrypto/bio/bio.h b/src/lib/libcrypto/bio/bio.h
index 43562d4872..f5d6e585bf 100644
--- a/src/lib/libcrypto/bio/bio.h
+++ b/src/lib/libcrypto/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
diff --git a/src/lib/libssl/src/crypto/bio/bio.h b/src/lib/libssl/src/crypto/bio/bio.h
index 43562d4872..f5d6e585bf 100644
--- a/src/lib/libssl/src/crypto/bio/bio.h
+++ b/src/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