diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-17 09:46:16 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-10-17 09:46:16 +0000 |
| commit | f5767da6d7815bd14b1bf31a1abbd095adebd73f (patch) | |
| tree | 5cf6a71f1fc3066b132839a63ef600bc6c48c30f | |
| parent | d32a6d37fe32beffd44e95dd062513cabcc86acb (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_3@65119 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | version.h | 8 | ||||
| -rw-r--r-- | win32/win32.c | 4 |
2 files changed, 6 insertions, 6 deletions
@@ -1,10 +1,10 @@ #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" diff --git a/win32/win32.c b/win32/win32.c index 6853ae367b..d057b0e006 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2366,6 +2366,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) @@ -2440,7 +2441,7 @@ set_pioinfo_extra(void) #else __pioinfo = *(ioinfo***)(p); #endif -#else +#endif int fd; fd = _open("NUL", O_RDONLY); @@ -2455,7 +2456,6 @@ set_pioinfo_extra(void) /* not found, maybe something wrong... */ pioinfo_extra = 0; } -#endif } #else #define pioinfo_extra 0 |