naruse	2017-03-13 02:23:03 +0900 (Mon, 13 Mar 2017)

  New Revision: 57936

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57936

  Log:
    merge revision(s) 57741: [Backport #13254]
    
    disable critical-error-handler
    
    * win32/win32.c (rb_w32_sysinit): disable critical-error-handler
      message box even on mswin, regardless of runtime DLL version.
      [ruby-dev:49988] [Bug #13254]

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/version.h
    branches/ruby_2_4/win32/win32.c
Index: ruby_2_4/win32/win32.c
===================================================================
--- ruby_2_4/win32/win32.c	(revision 57935)
+++ ruby_2_4/win32/win32.c	(revision 57936)
@@ -837,9 +837,8 @@ rb_w32_sysinit(int *argc, char ***argv) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/win32/win32.c#L837
     _set_invalid_parameter_handler(invalid_parameter);
     _RTC_SetErrorFunc(rtc_error_handler);
     set_pioinfo_extra();
-#else
-    SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
 #endif
+    SetErrorMode(SEM_FAILCRITICALERRORS|SEM_NOGPFAULTERRORBOX);
 
     get_version();
 
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57935)
+++ ruby_2_4/version.h	(revision 57936)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #define RUBY_VERSION "2.4.0"
 #define RUBY_RELEASE_DATE "2017-03-13"
-#define RUBY_PATCHLEVEL 90
+#define RUBY_PATCHLEVEL 91
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 3

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57741


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