diff options
Diffstat (limited to 'src/lib/libcrypto/bio/bss_conn.c')
| -rw-r--r-- | src/lib/libcrypto/bio/bss_conn.c | 10 |
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 @@ | |||
| 56 | * [including the GNU Public Licence.] | 56 | * [including the GNU Public Licence.] |
| 57 | */ | 57 | */ |
| 58 | 58 | ||
| 59 | #ifndef OPENSSL_NO_SOCK | ||
| 60 | |||
| 61 | #include <stdio.h> | 59 | #include <stdio.h> |
| 62 | #include <errno.h> | 60 | #include <errno.h> |
| 63 | #define USE_SOCKETS | 61 | #define USE_SOCKETS |
| 64 | #include "cryptlib.h" | 62 | #include "cryptlib.h" |
| 65 | #include <openssl/bio.h> | 63 | #include <openssl/bio.h> |
| 66 | 64 | ||
| 65 | #ifndef OPENSSL_NO_SOCK | ||
| 66 | |||
| 67 | #ifdef OPENSSL_SYS_WIN16 | 67 | #ifdef OPENSSL_SYS_WIN16 |
| 68 | #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ | 68 | #define SOCKET_PROTOCOL 0 /* more microsoft stupidity */ |
| 69 | #else | 69 | #else |
| @@ -130,7 +130,7 @@ static int conn_state(BIO *b, BIO_CONNECT *c) | |||
| 130 | int ret= -1,i; | 130 | int ret= -1,i; |
| 131 | unsigned long l; | 131 | unsigned long l; |
| 132 | char *p,*q; | 132 | char *p,*q; |
| 133 | int (*cb)()=NULL; | 133 | int (*cb)(const BIO *,int,int)=NULL; |
| 134 | 134 | ||
| 135 | if (c->info_callback != NULL) | 135 | if (c->info_callback != NULL) |
| 136 | cb=c->info_callback; | 136 | cb=c->info_callback; |
| @@ -590,9 +590,9 @@ static long conn_ctrl(BIO *b, int cmd, long num, void *ptr) | |||
| 590 | break; | 590 | break; |
| 591 | case BIO_CTRL_GET_CALLBACK: | 591 | case BIO_CTRL_GET_CALLBACK: |
| 592 | { | 592 | { |
| 593 | int (**fptr)(); | 593 | int (**fptr)(const BIO *bio,int state,int xret); |
| 594 | 594 | ||
| 595 | fptr=(int (**)())ptr; | 595 | fptr=(int (**)(const BIO *bio,int state,int xret))ptr; |
| 596 | *fptr=data->info_callback; | 596 | *fptr=data->info_callback; |
| 597 | } | 597 | } |
| 598 | break; | 598 | break; |
