diff options
| author | Richard Levitte <levitte@openssl.org> | 2003-04-04 15:19:19 +0000 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2003-04-04 15:19:19 +0000 |
| commit | 1891d5b1ff305f07ad407ec142752f9fcd9e9bb3 (patch) | |
| tree | 709261f70e0df0c8e8e57b5ab2ef6dfa57d20f7e /crypto/bio/bio.h | |
| parent | 5abe0cdad4a2cd74867c023f37cc94a699488cb3 (diff) | |
| download | openssl-new-1891d5b1ff305f07ad407ec142752f9fcd9e9bb3.tar.gz | |
All the changes from HEAD since last merge.
Diffstat (limited to 'crypto/bio/bio.h')
| -rw-r--r-- | crypto/bio/bio.h | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index c6d4e1c790..d350e12ac2 100644 --- a/crypto/bio/bio.h +++ b/crypto/bio/bio.h @@ -59,13 +59,14 @@ #ifndef HEADER_BIO_H #define HEADER_BIO_H +#include <openssl/e_os2.h> + #ifndef OPENSSL_NO_FP_API # include <stdio.h> #endif #include <stdarg.h> #include <openssl/crypto.h> -#include <openssl/e_os2.h> #ifdef __cplusplus extern "C" { @@ -244,7 +245,7 @@ typedef struct bio_method_st long (_far *ctrl)(); int (_far *create)(); int (_far *destroy)(); - long (_fat *callback_ctrl)(); + long (_far *callback_ctrl)(); } BIO_METHOD; #endif @@ -603,7 +604,7 @@ int BIO_sock_error(int sock); #ifdef OPENSSL_SYS_VMS int BIO_socket_ioctl(int fd, long type, UINT_L32p arg); #else -int BIO_socket_ioctl(int fd, long type, unsigned long *arg); +int BIO_socket_ioctl(int fd, long type, void *arg); #endif int BIO_socket_nbio(int fd,int mode); int BIO_get_port(const char *str, unsigned short *port_ptr); @@ -630,10 +631,17 @@ void BIO_copy_next_retry(BIO *b); /*long BIO_ghbn_ctrl(int cmd,int iarg,char *parg);*/ -int BIO_printf(BIO *bio, const char *format, ...); -int BIO_vprintf(BIO *bio, const char *format, va_list args); -int BIO_snprintf(char *buf, size_t n, const char *format, ...); -int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args); +#ifndef __GNUC__ +#define __attribute__(x) +#endif +int BIO_printf(BIO *bio, const char *format, ...) + __attribute__((__format__(__printf__,2,3))); +int BIO_vprintf(BIO *bio, const char *format, va_list args) + __attribute__((__format__(__printf__,2,0))); +int BIO_snprintf(char *buf, size_t n, const char *format, ...) + __attribute__((__format__(__printf__,3,4))); +int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args) + __attribute__((__format__(__printf__,3,0))); /* BEGIN ERROR CODES */ /* The following lines are auto generated by the script mkerr.pl. Any changes |