diff options
| author | Andy Polyakov <appro@openssl.org> | 2005-12-16 21:21:41 +0000 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2005-12-16 21:21:41 +0000 |
| commit | 1b167a434343a52d6d6c362ce9b6f702a2fac408 (patch) | |
| tree | def6c4a4b14d339fc920759c08b823beaf9cef76 /crypto/bio | |
| parent | 9ab5170197b9e676ecaf0b860d4add0fea7bda55 (diff) | |
Make bio.h resistant to gnu-ish __attribute__ redefenitions.
PR: 1252
Diffstat (limited to 'crypto/bio')
| -rw-r--r-- | crypto/bio/bio.h | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index 7f49ccbe9d..07333cf0b3 100644 --- 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 |