diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 16:15:34 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-25 16:15:34 +0000 |
| commit | 0f70d439c0fce703e33c1efedba2b738f2b50403 (patch) | |
| tree | 3e21d262fbe78e135d382c82a3674100a7767c64 | |
| parent | 9f853b2e1b874a7ae19c46cdbbec1aeb0adb3b4c (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_2@58097 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.2.7" #define RUBY_RELEASE_DATE "2017-03-26" -#define RUBY_PATCHLEVEL 429 +#define RUBY_PATCHLEVEL 430 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 diff --git a/win32/win32.c b/win32/win32.c index 185c683535..abd3bd6994 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -759,9 +759,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(); |