projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
09a6e19
)
Make DSO WIN32 compile again.
author
Dr. Stephen Henson
<steve@openssl.org>
Wed, 4 Jun 2008 11:53:14 +0000
(11:53 +0000)
committer
Dr. Stephen Henson
<steve@openssl.org>
Wed, 4 Jun 2008 11:53:14 +0000
(11:53 +0000)
crypto/dso/dso_win32.c
patch
|
blob
|
history
diff --git
a/crypto/dso/dso_win32.c
b/crypto/dso/dso_win32.c
index eea0b07c3c6bb23b8e84ab3e69caf3ded94a0584..b8693c13e54a3029325c9faf49e6804b76422c5f 100644
(file)
--- a/
crypto/dso/dso_win32.c
+++ b/
crypto/dso/dso_win32.c
@@
-188,7
+188,7
@@
static int win32_load(DSO *dso)
goto err;
}
*p = h;
goto err;
}
*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);
goto err;
{
DSOerr(DSO_F_WIN32_LOAD,DSO_R_STACK_ERROR);
goto err;
@@
-215,9
+215,9
@@
static int win32_unload(DSO *dso)
DSOerr(DSO_F_WIN32_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
return(0);
}
DSOerr(DSO_F_WIN32_UNLOAD,ERR_R_PASSED_NULL_PARAMETER);
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)
{
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_NULL_HANDLE);
if(p == NULL)
{
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);
/* We should push the value back onto the stack in
* case of a retry. */
DSOerr(DSO_F_WIN32_UNLOAD,DSO_R_UNLOAD_FAILED);
/* We should push the value back onto the stack in
* case of a retry. */
- sk_
push(dso->meth_data, (char *)
p);
+ sk_
void_push(dso->meth_data,
p);
return(0);
}
/* Cleanup */
return(0);
}
/* 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);
return(NULL);
}
DSOerr(DSO_F_WIN32_BIND_VAR,ERR_R_PASSED_NULL_PARAMETER);
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);
return(NULL);
}
{
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_STACK_ERROR);
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)
{
DSOerr(DSO_F_WIN32_BIND_VAR,DSO_R_NULL_HANDLE);
if(ptr == NULL)
{
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);
return(NULL);
}
DSOerr(DSO_F_WIN32_BIND_FUNC,ERR_R_PASSED_NULL_PARAMETER);
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);
return(NULL);
}
{
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_STACK_ERROR);
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)
{
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_NULL_HANDLE);
if(ptr == NULL)
{
DSOerr(DSO_F_WIN32_BIND_FUNC,DSO_R_NULL_HANDLE);