diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-16 23:23:05 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-16 23:23:05 +0000 |
| commit | 0b1e97d5d80bc7f3b9cfddfda1951c9a271c553c (patch) | |
| tree | b735ad49493eb7a4b515430a70e95a7b258951fc | |
| parent | ff5475bfa198c9f94ab9ac395f9a09f913326b6c (diff) | |
merge revision(s) 64913: [Backport #15223]
Support ubasecrt.dll 10.0.17763.1 included in Windows 10 October 2018 Update
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@65100 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | version.h | 6 | ||||
| -rw-r--r-- | win32/win32.c | 4 |
2 files changed, 5 insertions, 5 deletions
@@ -1,10 +1,10 @@ #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" diff --git a/win32/win32.c b/win32/win32.c index 407ab72977..b3105820e8 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2442,6 +2442,7 @@ EXTERN_C _CRTIMP ioinfo * __pioinfo[]; #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) #else __pioinfo = *(ioinfo***)(p); #endif -#else +#endif int fd; fd = _open("NUL", O_RDONLY); @@ -2531,7 +2532,6 @@ set_pioinfo_extra(void) /* not found, maybe something wrong... */ pioinfo_extra = 0; } -#endif } #else #define pioinfo_extra 0 |