Commit c029841e authored by Richard Levitte's avatar Richard Levitte
Browse files

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
parent bfa35550

crypto/bio/b_sock.c

+2 −2
Original line number Diff line number Diff line
@@ -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

crypto/bio/bio.h

+1 −1
Original line number Diff line number Diff line
@@ -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);