summaryrefslogtreecommitdiffstats
path: root/crypto/dso
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2000-06-21 02:25:30 +0000
committerDr. Stephen Henson <steve@openssl.org>2000-06-21 02:25:30 +0000
commit130832150c1313824868b154cccda3ace88fa950 (patch)
treef2b0eac7c3740a8b85f52210b42dc5dc9352557b /crypto/dso
parent7ef8206859f9a52f48e817c023c744fe00e82c5d (diff)
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/dso')
-rw-r--r--crypto/dso/dso_win32.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/dso/dso_win32.c b/crypto/dso/dso_win32.c
index 3a2baf2643..d613fbf378 100644
--- a/crypto/dso/dso_win32.c
+++ b/crypto/dso/dso_win32.c
@@ -141,14 +141,14 @@ static int win32_load(DSO *dso, const char *filename)
if(p == NULL)
{
DSOerr(DSO_F_WIN32_LOAD,ERR_R_MALLOC_FAILURE);
- OPENSSL_freeLibrary(h);
+ FreeLibrary(h);
return(0);
}
*p = h;
if(!sk_push(dso->meth_data, (char *)p))
{
DSOerr(DSO_F_WIN32_LOAD,DSO_R_STACK_ERROR);
- OPENSSL_freeLibrary(h);
+ FreeLibrary(h);
OPENSSL_free(p);
return(0);
}
@@ -171,7 +171,7 @@ static int win32_unload(DSO *dso)
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_NULL_HANDLE);
return(0);
}
- if(!OPENSSL_freeLibrary(p))
+ if(!FreeLibrary(*p))
{
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_UNLOAD_FAILED);
/* We should push the value back onto the stack in