diff options
| author | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-23 19:08:35 +0000 |
|---|---|---|
| committer | gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-07-23 19:08:35 +0000 |
| commit | f00c14ca25cd2298ccd9eb3765a4559b4306582c (patch) | |
| tree | cf6c55517974848407b5938e1380b89574252b8f /ext/openssl/ossl.h | |
| parent | 3f71dcc79bfec202cdc144c35e275d6895005c5e (diff) | |
| download | ruby-f00c14ca25cd2298ccd9eb3765a4559b4306582c.tar.gz | |
* 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
Diffstat (limited to 'ext/openssl/ossl.h')
| -rw-r--r-- | ext/openssl/ossl.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h index e1cd09ce4a..2d921f37b1 100644 --- a/ext/openssl/ossl.h +++ b/ext/openssl/ossl.h @@ -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> |