generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make DSO WIN32 compile again.

Browse Source
This commit is contained in:
Dr. Stephen Henson 2008-06-04 11:53:14 +00:00
parent 09a6e19431
commit c07a126fb2
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
crypto/dso/dso_win32.c
View File

@ -188,7 +188,7 @@ static int win32_load(DSO *dso)
goto err; goto err;
} }
*p = h; *p = h;
if(!sk_push(dso->meth_data, (char *)p)) if(!sk_void_push(dso->meth_data, p))
{ {
DSOerr(DSO_F_WIN32_LOAD,DSO_R_STACK_ERROR); DSOerr(DSO_F_WIN32_LOAD,DSO_R_STACK_ERROR);
goto err; goto err;
@ -215,9 +215,9 @@ static int win32_unload(DSO *dso)
DSOerr(DSO_F_WIN32_UNLOAD,ERR_R_PASSED_NULL_PARAMETER); DSOerr(DSO_F_WIN32_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
return(0); return(0);
} }
if(sk_num(dso->meth_data) < 1) if(sk_void_num(dso->meth_data) < 1)
return(1); return(1);
p = (HINSTANCE *)sk_pop(dso->meth_data); p = sk_void_pop(dso->meth_data);
if(p == NULL) if(p == NULL)
{ {
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_NULL_HANDLE); DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_NULL_HANDLE);
@ -228,7 +228,7 @@ static int win32_unload(DSO *dso)
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_UNLOAD_FAILED); DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_UNLOAD_FAILED);
/* We should push the value back onto the stack in /* We should push the value back onto the stack in
* case of a retry. */ * case of a retry. */
sk_push(dso->meth_data, (char *)p); sk_void_push(dso->meth_data, p);
return(0); return(0);
} }
/* Cleanup */ /* Cleanup */
@ -248,12 +248,12 @@ static void *win32_bind_var(DSO *dso, const char *symname)
DSOerr(DSO_F_WIN32_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER); DSOerr(DSO_F_WIN32_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
return(NULL); return(NULL);
} }
if(sk_num(dso->meth_data) < 1) if(sk_void_num(dso->meth_data) < 1)
{ {
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_STACK_ERROR); DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_STACK_ERROR);
return(NULL); return(NULL);
} }
ptr = (HINSTANCE *)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1); ptr = sk_void_value(dso->meth_data, sk_void_num(dso->meth_data) - 1);
if(ptr == NULL) if(ptr == NULL)
{ {
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_NULL_HANDLE); DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_NULL_HANDLE);
@ -279,12 +279,12 @@ static DSO_FUNC_TYPE win32_bind_func(DSO *dso, const char *symname)
DSOerr(DSO_F_WIN32_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER); DSOerr(DSO_F_WIN32_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER);
return(NULL); return(NULL);
} }
if(sk_num(dso->meth_data) < 1) if(sk_void_num(dso->meth_data) < 1)
{ {
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_STACK_ERROR); DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_STACK_ERROR);
return(NULL); return(NULL);
} }
ptr = (HINSTANCE *)sk_value(dso->meth_data, sk_num(dso->meth_data) - 1); ptr = sk_void_value(dso->meth_data, sk_void_num(dso->meth_data) - 1);
if(ptr == NULL) if(ptr == NULL)
{ {
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_NULL_HANDLE); DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_NULL_HANDLE);