ruby-changes:52906
From: usa <ko1@a...>
Date: Wed, 17 Oct 2018 18:46:22 +0900 (JST)
Subject: [ruby-changes:52906] usa:r65119 (ruby_2_3): merge revision(s) 64913: [Backport #15223]
usa 2018-10-17 18:46:16 +0900 (Wed, 17 Oct 2018) New Revision: 65119 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65119 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_3/ Modified files: branches/ruby_2_3/version.h branches/ruby_2_3/win32/win32.c Index: ruby_2_3/version.h =================================================================== --- ruby_2_3/version.h (revision 65118) +++ ruby_2_3/version.h (revision 65119) @@ -1,10 +1,10 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1 #define RUBY_VERSION "2.3.7" -#define RUBY_RELEASE_DATE "2018-03-28" -#define RUBY_PATCHLEVEL 456 +#define RUBY_RELEASE_DATE "2018-10-17" +#define RUBY_PATCHLEVEL 457 #define RUBY_RELEASE_YEAR 2018 -#define RUBY_RELEASE_MONTH 3 -#define RUBY_RELEASE_DAY 28 +#define RUBY_RELEASE_MONTH 10 +#define RUBY_RELEASE_DAY 17 #include "ruby/version.h" Index: ruby_2_3/win32/win32.c =================================================================== --- ruby_2_3/win32/win32.c (revision 65118) +++ ruby_2_3/win32/win32.c (revision 65119) @@ -2366,6 +2366,7 @@ EXTERN_C _CRTIMP ioinfo * __pioinfo[]; https://github.com/ruby/ruby/blob/trunk/ruby_2_3/win32/win32.c#L2366 #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) @@ -2440,7 +2441,7 @@ set_pioinfo_extra(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/win32/win32.c#L2441 #else __pioinfo = *(ioinfo***)(p); #endif -#else +#endif int fd; fd = _open("NUL", O_RDONLY); @@ -2455,7 +2456,6 @@ set_pioinfo_extra(void) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/win32/win32.c#L2456 /* not found, maybe something wrong... */ pioinfo_extra = 0; } -#endif } #else #define pioinfo_extra 0 Index: ruby_2_3 =================================================================== --- ruby_2_3 (revision 65118) +++ ruby_2_3 (revision 65119) Property changes on: ruby_2_3 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /trunk:r64913 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/