From f00c14ca25cd2298ccd9eb3765a4559b4306582c Mon Sep 17 00:00:00 2001
From: gotoyuzo <gotoyuzo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 23 Jul 2003 19:08:35 +0000
Subject: * 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
---
 ChangeLog          | 12 ++++++++++++
 ext/openssl/ossl.c |  6 +++---
 ext/openssl/ossl.h |  2 ++
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 93d055d6a7..9a0fdd1a76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Thu Jul 24 04:05:46 2003  GOTOU Yuuzou  <gotoyuzo@notwork.org>
+
+	* 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.
+
 Thu Jul 24 03:44:04 2003  Michal Rokos  <m.rokos@sh.cvut.cz>
 
 	* ext/openssl/extconf.rb: cut check for OpenSSL version
diff --git a/ext/openssl/ossl.c b/ext/openssl/ossl.c
index ab4572d2cf..559f8806af 100644
--- a/ext/openssl/ossl.c
+++ b/ext/openssl/ossl.c
@@ -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
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>
-- 
cgit v1.2.3