merge from trunk (r28333)

* error.c (rb_bug): existance of _set_abort_behavior() depends on
  runtime version, not compiler version.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28334 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 6 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 75a1ba2c07..e1de74b07f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jun 16 15:44:59 2010  NAKAMURA Usaku  <usa@ruby-lang.org>
+
+	* error.c (rb_bug): existance of _set_abort_behavior() depends on
+	  runtime version, not compiler version.
+
 Mon Jun 14 22:36:09 2010  Tanaka Akira  <akr@fsij.org>
 
 	* test/socket/test_socket.rb (test_udp_server): rescue Errno::ENOSYS 
diff --git a/error.c b/error.c
index 85f4c2a1be..0e1eab0a77 100644
--- a/error.c
+++ b/error.c
@@ -246,7 +246,7 @@ 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
+#if defined(_WIN32) && defined(RT_VER) && RT_VER >= 80
     _set_abort_behavior( 0, _CALL_REPORTFAULT);
 #endif