Things merged from the main trunk, among others some well needed Win32

fixes.
This commit is contained in:
Richard Levitte
2000-06-23 22:24:53 +00:00
parent ccd98b43ed
commit 1b2f8b6e2a
48 changed files with 1256 additions and 1103 deletions

View File

@@ -71,7 +71,7 @@ static int ssl_puts(BIO *h, const char *str);
static long ssl_ctrl(BIO *h, int cmd, long arg1, void *arg2);
static int ssl_new(BIO *h);
static int ssl_free(BIO *data);
static long ssl_callback_ctrl(BIO *h, int cmd, void (*fp)());
static long ssl_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp);
typedef struct bio_ssl_st
{
SSL *ssl; /* The ssl handle :-) */
@@ -470,7 +470,7 @@ static long ssl_ctrl(BIO *b, int cmd, long num, void *ptr)
return(ret);
}
static long ssl_callback_ctrl(BIO *b, int cmd, void (*fp)())
static long ssl_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp)
{
SSL *ssl;
BIO_SSL *bs;