resolve conflicts

1 files changed, 5 insertions, 5 deletions

diff --git a/src/lib/libcrypto/bio/bss_conn.c b/src/lib/libcrypto/bio/bss_conn.c
index 216780ed5e..c14727855b 100644
--- a/src/lib/libcrypto/bio/bss_conn.c
+++ b/src/lib/libcrypto/bio/bss_conn.c
@@ -56,14 +56,14 @@
  * [including the GNU Public Licence.]
  */
 
-#ifndef OPENSSL_NO_SOCK
-
 #include <stdio.h>
 #include <errno.h>
 #define USE_SOCKETS
 #include "cryptlib.h"
 #include <openssl/bio.h>
 
+#ifndef OPENSSL_NO_SOCK
+
 #ifdef OPENSSL_SYS_WIN16
 #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */
 #else
@@ -130,7 +130,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c)
         int ret= -1,i;
         unsigned long l;
         char *p,*q;
-        int (*cb)()=NULL;
+        int (*cb)(const BIO *,int,int)=NULL;
 
         if (c->info_callback != NULL)
                 cb=c->info_callback;
@@ -590,9 +590,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr)
                 break;
         case BIO_CTRL_GET_CALLBACK:
                 {
-                int (**fptr)();
+                int (**fptr)(const BIO *bio,int state,int xret);
 
-                fptr=(int (**)())ptr;
+                fptr=(int (**)(const BIO *bio,int state,int xret))ptr;
                 *fptr=data->info_callback;
                 }
                 break;