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

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
This commit is contained in:
usa 2017-03-25 16:15:34 +00:00
parent 9f853b2e1b
commit 0f70d439c0
2 changed files with 2 additions and 3 deletions

View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.7" #define RUBY_VERSION "2.2.7"
#define RUBY_RELEASE_DATE "2017-03-26" #define RUBY_RELEASE_DATE "2017-03-26"
#define RUBY_PATCHLEVEL 429 #define RUBY_PATCHLEVEL 430
#define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3

View file

@ -759,9 +759,8 @@ rb_w32_sysinit(int *argc, char ***argv)
_set_invalid_parameter_handler(invalid_parameter); _set_invalid_parameter_handler(invalid_parameter);
_RTC_SetErrorFunc(rtc_error_handler); _RTC_SetErrorFunc(rtc_error_handler);
set_pioinfo_extra(); set_pioinfo_extra();
#else
SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
#endif #endif
SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
get_version(); get_version();