nagachika	2018-10-17 08:23:05 +0900 (Wed, 17 Oct 2018)

  New Revision: 65100

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

  Log:
    merge revision(s) 64913: [Backport #15223]
    
    Support ubasecrt.dll 10.0.17763.1 included in Windows 10 October 2018 Update

  Modified directories:
    branches/ruby_2_5/
  Modified files:
    branches/ruby_2_5/version.h
    branches/ruby_2_5/win32/win32.c
Index: ruby_2_5/version.h
===================================================================
--- ruby_2_5/version.h	(revision 65099)
+++ ruby_2_5/version.h	(revision 65100)
@@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_5/version.h#L1
 #define RUBY_VERSION "2.5.2"
-#define RUBY_RELEASE_DATE "2018-10-12"
-#define RUBY_PATCHLEVEL 101
+#define RUBY_RELEASE_DATE "2018-10-17"
+#define RUBY_PATCHLEVEL 102
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 10
-#define RUBY_RELEASE_DAY 12
+#define RUBY_RELEASE_DAY 17
 
 #include "ruby/version.h"
 
Index: ruby_2_5/win32/win32.c
===================================================================
--- ruby_2_5/win32/win32.c	(revision 65099)
+++ ruby_2_5/win32/win32.c	(revision 65100)
@@ -2442,6 +2442,7 @@ EXTERN_C _CRTIMP ioinfo * __pioinfo[]; https://github.com/ruby/ruby/blob/trunk/ruby_2_5/win32/win32.c#L2442
 #endif
 static inline ioinfo* _pioinfo(int);
 
+
 #define IOINFO_ARRAY_ELTS	(1 << IOINFO_L2E)
 #define _osfhnd(i)  (_pioinfo(i)->osfhnd)
 #define _osfile(i)  (_pioinfo(i)->osfile)
@@ -2516,7 +2517,7 @@ set_pioinfo_extra(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_5/win32/win32.c#L2517
 #else
     __pioinfo = *(ioinfo***)(p);
 #endif
-#else
+#endif
     int fd;
 
     fd = _open("NUL", O_RDONLY);
@@ -2531,7 +2532,6 @@ set_pioinfo_extra(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_5/win32/win32.c#L2532
 	/* not found, maybe something wrong... */
 	pioinfo_extra = 0;
     }
-#endif
 }
 #else
 #define pioinfo_extra 0
Index: ruby_2_5
===================================================================
--- ruby_2_5	(revision 65099)
+++ ruby_2_5	(revision 65100)

Property changes on: ruby_2_5
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r64913

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