summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-23 22:58:05 +0000
committernaruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-04-23 22:58:05 +0000
commitcc622e2ac5f72f229daa29fc5e24ae7f92dae150 (patch)
tree2cf35e4e1ef6be1f6326f69529ef9ebd164066b7
parent62c2b2e80a03c6f4e5a304bcf113e6f3a9d6cbee (diff)
* win32/win32.c (dupfd): use _set_osfhnd.
* win32/win32.c (rb_w32_wopen): use _set_osflags. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50377 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--win32/win32.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 894f4c1f61..294d466099 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Fri Apr 24 06:37:07 2015 NARUSE, Yui <naruse@ruby-lang.org>
+
+ * win32/win32.c (dupfd): use _set_osfhnd.
+
+ * win32/win32.c (rb_w32_wopen): use _set_osflags.
+
Thu Apr 24 05:38:01 2015 Koichi Sasada <ko1@atdot.net>
* gc.c (gc_mark_roots): fox to work PRINT_ROOT_TICKS.
diff --git a/win32/win32.c b/win32/win32.c
index 21d59d41ba..8a19ca0c27 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -4113,7 +4113,7 @@ dupfd(HANDLE hDup, char flags, int minfd)
save_errno = errno;
while (filled > 0) {
int fd = fds[--filled];
- _osfhnd(fd) = (intptr_t)INVALID_HANDLE_VALUE;
+ _set_osfhnd(fd, (intptr_t)INVALID_HANDLE_VALUE);
close(fd);
}
errno = save_errno;
@@ -6100,7 +6100,7 @@ rb_w32_wopen(const WCHAR *file, int oflag, ...)
flags |= FAPPEND;
_set_osfhnd(fd, (intptr_t)h);
- _osfile(fd) = flags | FOPEN;
+ _set_osflags(fd, flags | FOPEN);
MTHREAD_ONLY(LeaveCriticalSection(&_pioinfo(fd)->lock));
quit: