From b41974acc90e5b68e2861244481eb4df9c9b0932 Mon Sep 17 00:00:00 2001
From: usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 10 Sep 2003 13:43:27 +0000
Subject: * eval.c (win32_get_exception_list): avoid VC7 warning.  
 [ruby-win32:577]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@4542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                 | 5 +++++
 eval.c                    | 4 ++++
 ext/openssl/ossl.h        | 1 +
 ext/openssl/ossl_config.c | 8 ++++++++
 4 files changed, 18 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7d3f8d848..11cb9aefd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Sep 10 22:41:54 2003  Tietew <tietew@tietew.net>
+
+	* eval.c (win32_get_exception_list): avoid VC7 warning.
+	  [ruby-win32:577]
+
 Tue Sep  9 10:39:51 2003  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (struct tag): dst should be VALUE.
diff --git a/eval.c b/eval.c
index 7119596b3..435de8148 100644
--- a/eval.c
+++ b/eval.c
@@ -7741,6 +7741,10 @@ win32_get_exception_list()
 # if defined _MSC_VER
 #   ifdef _M_IX86
 #   define SAVE_WIN32_EXCEPTION_LIST
+#   if _MSC_VER >= 1310
+      /* warning: unsafe assignment to fs:0 ... this is ok */
+#     pragma warning(disable: 4733)
+#   endif
     __asm mov eax, fs:[0];
     __asm mov p, eax;
 #   endif
diff --git a/ext/openssl/ossl.h b/ext/openssl/ossl.h
index e684d212e..fd0c41ee1 100644
--- a/ext/openssl/ossl.h
+++ b/ext/openssl/ossl.h
@@ -24,6 +24,7 @@ extern "C" {
 
 #if defined(_WIN32)
 #  define OpenFile WINAPI_OpenFile
+#  define OSSL_NO_CONF_API 1
 #endif
 #include <errno.h>
 #include <openssl/err.h>
diff --git a/ext/openssl/ossl_config.c b/ext/openssl/ossl_config.c
index 835f2a5b3..1e42cb6e9 100644
--- a/ext/openssl/ossl_config.c
+++ b/ext/openssl/ossl_config.c
@@ -148,7 +148,11 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self)
 		ossl_raise(eConfigError, "error in %s:%d", filename, eline);
         }
     }
+#ifdef OSSL_NO_CONF_API
+    else rb_raise(rb_eArgError, "wrong number of arguments(0 for 1)");
+#else
     else _CONF_new_data(conf);
+#endif
     
     return self;
 }
@@ -156,6 +160,9 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self)
 static VALUE
 ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
 {
+#ifdef OSSL_NO_CONF_API
+    rb_notimplement();
+#else
     CONF *conf;
     CONF_VALUE *sv, *cv;
 
@@ -181,6 +188,7 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
     }
     
     return value;
+#endif
 }
 
 static VALUE
-- 
cgit