usa	2010-06-16 15:45:28 +0900 (Wed, 16 Jun 2010)

  New Revision: 28334

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=28334

  Log:
    merge from trunk (r28333)
    
    * error.c (rb_bug): existance of _set_abort_behavior() depends on
      runtime version, not compiler version.

  Modified files:
    branches/ruby_1_9_2/ChangeLog
    branches/ruby_1_9_2/error.c

Index: ruby_1_9_2/ChangeLog
===================================================================
--- ruby_1_9_2/ChangeLog	(revision 28333)
+++ ruby_1_9_2/ChangeLog	(revision 28334)
@@ -1,3 +1,8 @@
+Wed Jun 16 15:44:59 2010  NAKAMURA Usaku  <usa@r...>
+
+	* 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@f...>
 
 	* test/socket/test_socket.rb (test_udp_server): rescue Errno::ENOSYS 
Index: ruby_1_9_2/error.c
===================================================================
--- ruby_1_9_2/error.c	(revision 28333)
+++ ruby_1_9_2/error.c	(revision 28334)
@@ -246,7 +246,7 @@
     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
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/