archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 64913: [Backport #15223]

Browse source 
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_4@65110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2018-10-17 08:11:45 +00:00
parent f1de89ce06
commit bfdc70f83c
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.5" #define RUBY_VERSION "2.4.5"
#define RUBY_RELEASE_DATE "2018-10-17" #define RUBY_RELEASE_DATE "2018-10-17"
#define RUBY_PATCHLEVEL 324 #define RUBY_PATCHLEVEL 325
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 10 #define RUBY_RELEASE_MONTH 10

4
win32/win32.c
View file

@ -2425,6 +2425,7 @@ EXTERN_C _CRTIMP ioinfo * __pioinfo[];
#endif #endif
static inline ioinfo* _pioinfo(int); static inline ioinfo* _pioinfo(int);
#define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E) #define IOINFO_ARRAY_ELTS (1 << IOINFO_L2E)
#define _osfhnd(i) (_pioinfo(i)->osfhnd) #define _osfhnd(i) (_pioinfo(i)->osfhnd)
#define _osfile(i) (_pioinfo(i)->osfile) #define _osfile(i) (_pioinfo(i)->osfile)
@ -2499,7 +2500,7 @@ set_pioinfo_extra(void)
#else #else
__pioinfo = *(ioinfo***)(p); __pioinfo = *(ioinfo***)(p);
#endif #endif
#else #endif
int fd; int fd;
fd = _open("NUL", O_RDONLY); fd = _open("NUL", O_RDONLY);
@ -2514,7 +2515,6 @@ set_pioinfo_extra(void)
/* not found, maybe something wrong... */ /* not found, maybe something wrong... */
pioinfo_extra = 0; pioinfo_extra = 0;
} }
#endif
} }
#else #else
#define pioinfo_extra 0 #define pioinfo_extra 0