diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2000-06-21 04:25:30 +0200 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2000-06-21 04:25:30 +0200 |
commit | 130832150c1313824868b154cccda3ace88fa950 (patch) | |
tree | f2b0eac7c3740a8b85f52210b42dc5dc9352557b /crypto/bio/bf_buff.c | |
parent | Handle ASN1_SET_OF and PKCS12_STACK_OF using function (diff) | |
download | openssl-130832150c1313824868b154cccda3ace88fa950.tar.xz openssl-130832150c1313824868b154cccda3ace88fa950.zip |
Fixes for Win32 build.
This is mostly a work around for the old VC++ problem
that it treats func() as func(void).
Various prototypes had been added to 'compare' function
pointers that triggered this. This could be fixed by removing
the prototype, adding function pointer casts to every call or
changing the passed function to use the expected arguments.
I mostly did the latter.
The mkdef.pl script was modified to remove the typesafe
functions which no longer exist.
Oh and some functions called OPENSSL_freeLibrary() were
changed back to FreeLibrary(), wonder how that happened :-)
Diffstat (limited to 'crypto/bio/bf_buff.c')
-rw-r--r-- | crypto/bio/bf_buff.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/bio/bf_buff.c b/crypto/bio/bf_buff.c index e9916d29eb..c65dc142a5 100644 --- a/crypto/bio/bf_buff.c +++ b/crypto/bio/bf_buff.c @@ -69,7 +69,7 @@ static int buffer_gets(BIO *h, char *str, int size); static long buffer_ctrl(BIO *h, int cmd, long arg1, void *arg2); static int buffer_new(BIO *h); static int buffer_free(BIO *data); -static long buffer_callback_ctrl(BIO *h, int cmd, void (*fp)()); +static long buffer_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp); #define DEFAULT_BUFFER_SIZE 1024 static BIO_METHOD methods_buffer= @@ -439,7 +439,7 @@ malloc_error: return(0); } -static long buffer_callback_ctrl(BIO *b, int cmd, void (*fp)()) +static long buffer_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp) { long ret=1; |