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
|
@ -34,6 +34,8 @@ extern "C" {
|
|||
#include <openssl/ssl.h>
|
||||
#include <openssl/hmac.h>
|
||||
#include <openssl/rand.h>
|
||||
#undef X509_NAME
|
||||
#undef PKCS7_SIGNER_INFO
|
||||
#if defined(HAVE_OPENSSL_OCSP_H)
|
||||
# define OSSL_OCSP_ENABLED
|
||||
# include <openssl/ocsp.h>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue