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

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index 86f38172fba682f8b46b8b477bf0358f0a03add9..601a14f37c5b5654f3481d09bd8fbaaa8b17c695 100644 (file)
--- 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
 
 
 #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;
 
        {
        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;
 int BIO_socket_nbio(int s, int mode)
        {
        int ret= -1;

-       unsigned long l;
+       int l;

 
        l=mode;
 #ifdef FIONBIO
 
        l=mode;
 #ifdef FIONBIO

diff --git a/crypto/bio/bio.h b/crypto/bio/bio.h
index ecd28999187467094700a6e5681ac30f42816a1b..f109308166988f7ccd7a0e6ab1c6939800028548 100644 (file)
--- 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);
  * 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);
 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);