aboutsummaryrefslogtreecommitdiffstats
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
commit47000e8aebb2e9355d0dc72197e95681768f2c4c (patch)
tree504bf34cc856afa92ca62bee25d5aa1039b69c95
parent7e3454037a02712e99216fef8130724bf305e3e6 (diff)
downloadruby-47000e8aebb2e9355d0dc72197e95681768f2c4c.tar.gz
* 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/trunk@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 494237df29..b0fa882b2c 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.
+
Fri May 28 00:32:25 2010 Yusuke Endoh <mame@tsg.ne.jp>
* insns.def (invokesuper): check consistency between class of self and
diff --git a/error.c b/error.c
index addf8b63f2..5afabce482 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();
}