naruse	2012-06-27 04:23:58 +0900 (Wed, 27 Jun 2012)

  New Revision: 36227

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

  Log:
    merge revision(s) 35913: [Backport #6640]
    
    * 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]

  Modified files:
    branches/ruby_1_9_3/ChangeLog
    branches/ruby_1_9_3/version.h
    branches/ruby_1_9_3/win32/win32.c

Index: ruby_1_9_3/ChangeLog
===================================================================
--- ruby_1_9_3/ChangeLog	(revision 36226)
+++ ruby_1_9_3/ChangeLog	(revision 36227)
@@ -1,3 +1,9 @@
+Wed Jun 27 04:23:26 2012  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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]
+
 Wed Jun 27 04:20:41 2012  Nobuyoshi Nakada  <nobu@r...>
 
 	* bignum.c (rb_big_pow): estimate result bit size more precisely.
Index: ruby_1_9_3/win32/win32.c
===================================================================
--- ruby_1_9_3/win32/win32.c	(revision 36226)
+++ ruby_1_9_3/win32/win32.c	(revision 36227)
@@ -674,6 +674,8 @@
     _set_invalid_parameter_handler(invalid_parameter);
     _RTC_SetErrorFunc(rtc_error_handler);
     set_pioinfo_extra();
+#else
+    SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
 #endif
 
     get_version();
Index: ruby_1_9_3/version.h
===================================================================
--- ruby_1_9_3/version.h	(revision 36226)
+++ ruby_1_9_3/version.h	(revision 36227)
@@ -1,5 +1,5 @@
 #define RUBY_VERSION "1.9.3"
-#define RUBY_PATCHLEVEL 240
+#define RUBY_PATCHLEVEL 241
 
 #define RUBY_RELEASE_DATE "2012-06-27"
 #define RUBY_RELEASE_YEAR 2012

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