diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2000-06-21 02:25:30 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2000-06-21 02:25:30 +0000 |
| commit | 130832150c1313824868b154cccda3ace88fa950 (patch) | |
| tree | f2b0eac7c3740a8b85f52210b42dc5dc9352557b /crypto/bio/bf_null.c | |
| parent | 7ef8206859f9a52f48e817c023c744fe00e82c5d (diff) | |
| download | openssl-130832150c1313824868b154cccda3ace88fa950.tar.gz | |
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_null.c')
| -rw-r--r-- | crypto/bio/bf_null.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/crypto/bio/bf_null.c b/crypto/bio/bf_null.c index a3f0b02a7f..2678a1a85d 100644 --- a/crypto/bio/bf_null.c +++ b/crypto/bio/bf_null.c @@ -72,7 +72,7 @@ static int nullf_gets(BIO *h, char *str, int size); static long nullf_ctrl(BIO *h, int cmd, long arg1, void *arg2); static int nullf_new(BIO *h); static int nullf_free(BIO *data); -static long nullf_callback_ctrl(BIO *h, int cmd, void (*fp)()); +static long nullf_callback_ctrl(BIO *h, int cmd, bio_info_cb *fp); static BIO_METHOD methods_nullf= { BIO_TYPE_NULL_FILTER, @@ -154,7 +154,7 @@ static long nullf_ctrl(BIO *b, int cmd, long num, void *ptr) return(ret); } -static long nullf_callback_ctrl(BIO *b, int cmd, void (*fp)()) +static long nullf_callback_ctrl(BIO *b, int cmd, bio_info_cb *fp) { long ret=1; |