diff options
author | Richard Levitte <levitte@openssl.org> | 2003-01-31 12:20:35 +0000 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2003-01-31 12:20:35 +0000 |
commit | c029841e366b5156982d2a691726a3481dbf8ea0 (patch) | |
tree | cf7f5d7351a86fc39f4cdf67c22f6a74d7e8603c | |
parent | bfa35550813c3afa5bd121a13f5bbe280c4c919e (diff) |
We can't say in advance what the argument to BIO_socket_ioctl() should be, so
let's make that a void *. Also, BIO_socket_nbio() should send it an int
argument, not a long.
PR: 457
-rw-r--r-- | crypto/bio/b_sock.c | 4 | ||||
-rw-r--r-- | crypto/bio/bio.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c index 86f38172fb..601a14f37c 100644 --- a/crypto/bio/b_sock.c +++ b/crypto/bio/b_sock.c @@ -492,7 +492,7 @@ void BIO_sock_cleanup(void) #if !defined(OPENSSL_SYS_VMS) || __VMS_VER >= 70000000 -int BIO_socket_ioctl(int fd, long type, unsigned long *arg) +int BIO_socket_ioctl(int fd, long type, void *arg) { int i; @@ -742,7 +742,7 @@ int BIO_set_tcp_ndelay(int s, int on) int BIO_socket_nbio(int s, int mode) { int ret= -1; - unsigned long l; + int l; l=mode; #ifdef FIONBIO diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h index ecd2899918..f109308166 100644 --- a/crypto/bio/bio.h +++ b/crypto/bio/bio.h @@ -585,7 +585,7 @@ struct hostent *BIO_gethostbyname(const char *name); * and an appropriate error code is set). */ int BIO_sock_error(int sock); -int BIO_socket_ioctl(int fd, long type, unsigned long *arg); +int BIO_socket_ioctl(int fd, long type, void *arg); int BIO_socket_nbio(int fd,int mode); int BIO_get_port(const char *str, unsigned short *port_ptr); int BIO_get_host_ip(const char *str, unsigned char *ip); |