Delete the unnecessary ERR and ERRC lines in makefiles, add some functionality

[oweals/openssl.git] / crypto / bio / b_sock.c

diff --git a/crypto/bio/b_sock.c b/crypto/bio/b_sock.c
index d14a7797fdd3206513669c4b222462ad2f8b0ac4..328394efe42614d41e20af26e19a0e405268a155 100644 (file)
--- a/crypto/bio/b_sock.c
+++ b/crypto/bio/b_sock.c
@@ -63,7 +63,7 @@
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
-#include "bio.h"
+#include <openssl/bio.h>
 
 /*     BIOerr(BIO_F_WSASTARTUP,BIO_R_WSASTARTUP ); */
 
@@ -195,11 +195,12 @@ int BIO_get_port(const char *str, unsigned short *port_ptr)
 
 int BIO_sock_error(int sock)
        {
-       int j,i,size;
+       int j,i;
+       int size;
                 
        size=sizeof(int);
 
-       i=getsockopt(sock,SOL_SOCKET,SO_ERROR,(char *)&j,&size);
+       i=getsockopt(sock,SOL_SOCKET,SO_ERROR,&j,&size);
        if (i < 0)
                return(1);
        else