aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-04 12:54:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-04 12:54:00 +0000
commit07e222d720a8e6935d47f5747551a50f21016e76 (patch)
tree817804628366e256639e88137f9d5a9a2a02c157
parent9ab2ce20b3197b9f8c6bb8caca508ed6c04f1f5c (diff)
downloadruby-07e222d720a8e6935d47f5747551a50f21016e76.tar.gz
no windows dialog
* 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/trunk@35913 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--win32/win32.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d530ac1952..38756748d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Jun 4 21:53:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * 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]
+
Mon Jun 4 19:36:25 2012 Tanaka Akira <akr@fsij.org>
* process.c (rb_exec_fillarg): allocate one more element before
diff --git a/win32/win32.c b/win32/win32.c
index d7166b646b..e5be0d94af 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -774,6 +774,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();