From eeb409a257629698b101c49813e08c008136d494 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 26 Jun 2012 19:23:58 +0000 Subject: merge revision(s) 35913: [Backport #6640] * win32/win32.c (rb_w32_sysinit): let the system not display the critical-error-handler message box and the Windows Error Reporting dialog. [ruby-core:45389] [Bug #6535] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@36227 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ version.h | 2 +- win32/win32.c | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eb72ea898c..c7be8fad27 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Jun 27 04:23:26 2012 Nobuyoshi Nakada + + * win32/win32.c (rb_w32_sysinit): let the system not display the + critical-error-handler message box and the Windows Error Reporting + dialog. [ruby-core:45389] [Bug #6535] + Wed Jun 27 04:20:41 2012 Nobuyoshi Nakada * bignum.c (rb_big_pow): estimate result bit size more precisely. diff --git a/version.h b/version.h index 68ad486f2b..e436236204 100644 --- a/version.h +++ b/version.h @@ -1,5 +1,5 @@ #define RUBY_VERSION "1.9.3" -#define RUBY_PATCHLEVEL 240 +#define RUBY_PATCHLEVEL 241 #define RUBY_RELEASE_DATE "2012-06-27" #define RUBY_RELEASE_YEAR 2012 diff --git a/win32/win32.c b/win32/win32.c index 817dc31d35..79f8de6e02 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -674,6 +674,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 get_version(); -- cgit v1.2.3