diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | eval.c | 4 | ||||
| -rw-r--r-- | ext/openssl/ossl.h | 1 | ||||
| -rw-r--r-- | ext/openssl/ossl_config.c | 8 |
4 files changed, 18 insertions, 0 deletions
@@ -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. @@ -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 e684d212e6..fd0c41ee1d 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 835f2a5b3d..1e42cb6e9f 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 |