mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* ext/openssl/ssl.h: undef X509_NAME and PKCS7_SIGNER_INFO to
avoid name confliction on mswin32. * ext/openssl/ssl.c (ossl_protect_obj2bio): avoid VC++ warnings in function prototype. * ext/openssl/ssl.c (ossl_protect_membio2str): ditto. * ext/openssl/ssl.c (ossl_protect_x509_ary2sk): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4134 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
3f71dcc79b
commit
f00c14ca25
3 changed files with 17 additions and 3 deletions
|
@ -207,7 +207,7 @@ BIO *
|
|||
ossl_protect_obj2bio(VALUE obj, int *status)
|
||||
{
|
||||
BIO *ret = NULL;
|
||||
ret = (BIO*)rb_protect((VALUE(*)())ossl_obj2bio, obj, status);
|
||||
ret = (BIO*)rb_protect((VALUE(*)_((VALUE)))ossl_obj2bio, obj, status);
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -226,7 +226,7 @@ ossl_membio2str(BIO *bio)
|
|||
VALUE
|
||||
ossl_protect_membio2str(BIO *bio, int *status)
|
||||
{
|
||||
return rb_protect((VALUE(*)())ossl_membio2str, (VALUE)bio, status);
|
||||
return rb_protect((VALUE(*)_((VALUE)))ossl_membio2str, (VALUE)bio, status);
|
||||
}
|
||||
|
||||
STACK_OF(X509) *
|
||||
|
@ -256,7 +256,7 @@ ossl_x509_ary2sk(VALUE ary)
|
|||
STACK_OF(X509) *
|
||||
ossl_protect_x509_ary2sk(VALUE ary, int *status)
|
||||
{
|
||||
return (STACK_OF(X509)*)rb_protect((VALUE(*)())ossl_x509_ary2sk, ary, status);
|
||||
return (STACK_OF(X509)*)rb_protect((VALUE(*)_((VALUE)))ossl_x509_ary2sk, ary, status);
|
||||
}
|
||||
|
||||
#if 0
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue