kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* eval.c (win32_get_exception_list): avoid VC7 warning.

Browse source 
[ruby-win32:577]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@4542 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2003-09-10 13:43:27 +00:00
parent 46b5d7308b
commit 3587c1c725
4 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -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> Tue Sep 9 10:39:51 2003 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (struct tag): dst should be VALUE. * eval.c (struct tag): dst should be VALUE.

4
eval.c
View file

@ -7741,6 +7741,10 @@ win32_get_exception_list()
# if defined _MSC_VER # if defined _MSC_VER
# ifdef _M_IX86 # ifdef _M_IX86
# define SAVE_WIN32_EXCEPTION_LIST # 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 eax, fs:[0];
__asm mov p, eax; __asm mov p, eax;
# endif # endif

1
ext/openssl/ossl.h
View file

@ -24,6 +24,7 @@ extern "C" {
#if defined(_WIN32) #if defined(_WIN32)
# define OpenFile WINAPI_OpenFile # define OpenFile WINAPI_OpenFile
# define OSSL_NO_CONF_API 1
#endif #endif
#include <errno.h> #include <errno.h>
#include <openssl/err.h> #include <openssl/err.h>

8
ext/openssl/ossl_config.c
View file

@ -148,7 +148,11 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self)
ossl_raise(eConfigError, "error in %s:%d", filename, eline); 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); else _CONF_new_data(conf);
#endif
return self; return self;
} }
@ -156,6 +160,9 @@ ossl_config_initialize(int argc, VALUE *argv, VALUE self)
static VALUE static VALUE
ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value) ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
{ {
#ifdef OSSL_NO_CONF_API
rb_notimplement();
#else
CONF *conf; CONF *conf;
CONF_VALUE *sv, *cv; CONF_VALUE *sv, *cv;
@ -181,6 +188,7 @@ ossl_config_add_value(VALUE self, VALUE section, VALUE name, VALUE value)
} }
return value; return value;
#endif
} }
static VALUE static VALUE