Make bio.h resistant to gnu-ish __attribute__ redefenitions.

PR: 1252

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index 7f49ccbe9dd6f7bb5e0b429d5e06ada8e996a12e..07333cf0b32e7b55efda90e2e9d719aaaa4b2f65 100644 (file)
--- a/crypto/bio/bio.h
+++ b/crypto/bio/bio.h
@@ -676,17 +676,20 @@ void BIO_copy_next_retry(BIO *b);
 
 /*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/
 
-#ifndef __GNUC__
-#define __attribute__(x)
+#ifdef __GNUC__
+#  define __bio_h__attr__ __attribute__
+#else
+#  define __bio_h__attr__(x)
 #endif
 int BIO_printf(BIO *bio, const char *format, ...)
-       __attribute__((__format__(__printf__,2,3)));
+       __bio_h__attr__((__format__(__printf__,2,3)));
 int BIO_vprintf(BIO *bio, const char *format, va_list args)
-       __attribute__((__format__(__printf__,2,0)));
+       __bio_h__attr__((__format__(__printf__,2,0)));
 int BIO_snprintf(char *buf, size_t n, const char *format, ...)
-       __attribute__((__format__(__printf__,3,4)));
+       __bio_h__attr__((__format__(__printf__,3,4)));
 int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args)
-       __attribute__((__format__(__printf__,3,0)));
+       __bio_h__attr__((__format__(__printf__,3,0)));
+#undef __bio_h__attr__
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes