summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-27 15:53:42 +0000
committertarui <tarui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-05-27 15:53:42 +0000
commitf3f9898afe486c732f65374cc73d5c78c4548b9e (patch)
tree5f2fb064d3c1f5f7beed3d6d6ed67f09c56cbfac
parentf813ed043e9b7fe80ccb9e39c482f5974ea61e60 (diff)
* error.c (rb_bug): suppress the error report dialog if report_bug()
is finished successfly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28045 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--error.c4
2 files changed, 9 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6f1b0772cc..020528e4e3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 28 00:47:16 2010 Masaya Tarui <tarui@ruby-lnag.org>
+
+ * error.c (rb_bug): suppress the error report dialog if report_bug()
+ is finished successfly.
+
Thu May 27 23:52:43 2010 NARUSE, Yui <naruse@ruby-lang.org>
* include/ruby/encoding.h (rb_filesystem_encindex): defined.
diff --git a/error.c b/error.c
index 05e6b08f8d..e1fe2aa497 100644
--- a/error.c
+++ b/error.c
@@ -246,6 +246,10 @@ rb_bug(const char *fmt, ...)
report_bug(rb_sourcefile(), rb_sourceline(), fmt, args);
va_end(args);
+#if defined(_WIN32) && defined(_MSC_VER) && _MSC_VER >= 1400
+ _set_abort_behavior( 0, _CALL_REPORTFAULT);
+#endif
+
abort();
}