diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-12 17:23:03 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-12 17:23:03 +0000 |
commit | 81be1699cb3542c466a6f28079db1dc2b4e66e13 (patch) | |
tree | 57248bac5b93cae44b6e42fa1c424ab206c92cd5 | |
parent | acfebb41ddea04ded300bc1c1aedbf7ebebcf276 (diff) |
merge revision(s) 57741: [Backport #13254]
disable critical-error-handler
* win32/win32.c (rb_w32_sysinit): disable critical-error-handler
message box even on mswin, regardless of runtime DLL version.
[ruby-dev:49988] [Bug #13254]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57936 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | version.h | 2 | ||||
-rw-r--r-- | win32/win32.c | 3 |
2 files changed, 2 insertions, 3 deletions
@@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.0" #define RUBY_RELEASE_DATE "2017-03-13" -#define RUBY_PATCHLEVEL 90 +#define RUBY_PATCHLEVEL 91 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 diff --git a/win32/win32.c b/win32/win32.c index 385bda64c9..62801dae71 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -837,9 +837,8 @@ rb_w32_sysinit(int *argc, char ***argv) _set_invalid_parameter_handler(invalid_parameter); _RTC_SetErrorFunc(rtc_error_handler); set_pioinfo_extra(); -#else - SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX); #endif + SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX); get_version(); |