summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-17 08:11:45 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-10-17 08:11:45 +0000
commitbfdc70f83c57619aedfcb52f4841085c3b2ea2d3 (patch)
tree16f6897fff6062d267e73ee5c2d446846c0acb0c
parentf1de89ce060a49e0c7f0364dc377748c3fab03ad (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_4@65110 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--version.h2
-rw-r--r--win32/win32.c4
2 files changed, 3 insertions, 3 deletions
diff --git a/version.h b/version.h
index 9090edd9f4..0c53981b31 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.5"
#define RUBY_RELEASE_DATE "2018-10-17"
-#define RUBY_PATCHLEVEL 324
+#define RUBY_PATCHLEVEL 325
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 10
diff --git a/win32/win32.c b/win32/win32.c
index 5a7e596863..e406881b8c 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -2425,6 +2425,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)
@@ -2499,7 +2500,7 @@ set_pioinfo_extra(void)
#else
__pioinfo = *(ioinfo***)(p);
#endif
-#else
+#endif
int fd;
fd = _open("NUL", O_RDONLY);
@@ -2514,7 +2515,6 @@ set_pioinfo_extra(void)
/* not found, maybe something wrong... */
pioinfo_extra = 0;
}
-#endif
}
#else
#define pioinfo_extra 0