diff options
author | marha <marha@users.sourceforge.net> | 2010-06-17 08:30:55 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-06-17 08:30:55 +0000 |
commit | eb8e32daea99b6e3ebf134efeeba184c23817f08 (patch) | |
tree | ffbda57952ba3f40612e6409bd9a95f9a0a892dc /openssl/crypto/stack/safestack.h | |
parent | ed16af1abc515d7cc3ff9c5794aef89551fe7494 (diff) | |
parent | fef0b61e18b9c7475e4d6e67ddfc55db46573f4e (diff) | |
download | vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.tar.gz vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.tar.bz2 vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.zip |
svn merge ^/branches/released .
Diffstat (limited to 'openssl/crypto/stack/safestack.h')
-rw-r--r-- | openssl/crypto/stack/safestack.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/crypto/stack/safestack.h b/openssl/crypto/stack/safestack.h index d616b4aab..891cb84a5 100644 --- a/openssl/crypto/stack/safestack.h +++ b/openssl/crypto/stack/safestack.h @@ -179,7 +179,7 @@ DECLARE_SPECIAL_STACK_OF(OPENSSL_BLOCK, void) sk_is_sorted(CHECKED_STACK_OF(type, st)) #define SKM_ASN1_SET_OF_d2i(type, st, pp, length, d2i_func, free_func, ex_tag, ex_class) \ - (STACK_OF(type) *)d2i_ASN1_SET(CHECKED_STACK_OF(type, st), \ + (STACK_OF(type) *)d2i_ASN1_SET((STACK_OF(OPENSSL_BLOCK) **)CHECKED_STACK_OF(type, st), \ pp, length, \ CHECKED_D2I_OF(type, d2i_func), \ CHECKED_SK_FREE_FUNC(type, free_func), \ |