diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-10 08:37:21 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-04-10 08:37:21 +0000 |
| commit | edac529177869bba554621b4bfad2be7c08adbf8 (patch) | |
| tree | cf98d20d9be044e3d386ee9a1174c27137e80af2 /win32 | |
| parent | 0d2ec8d2f4134fc5cf8d0f7f29ae970d89651f18 (diff) | |
* thread_win32.ci (w32_wait_events): check whether interrupt_event is
valid handle or not.
* thread_win32.ci (native_thread_destroy): clear interrupt_event when
close it.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12166 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/win32/win32.c b/win32/win32.c index f82a2f4494..cd344eac94 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -3634,6 +3634,7 @@ rb_w32_fclose(FILE *fp) { int fd = fileno(fp); SOCKET sock = TO_SOCKET(fd); + int save_errno = errno; if (fflush(fp)) return -1; if (!is_socket(sock)) { @@ -3642,6 +3643,7 @@ rb_w32_fclose(FILE *fp) } _set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE); fclose(fp); + errno = save_errno; if (closesocket(sock) == SOCKET_ERROR) { errno = map_errno(WSAGetLastError()); return -1; @@ -3653,6 +3655,7 @@ int rb_w32_close(int fd) { SOCKET sock = TO_SOCKET(fd); + int save_errno = errno; if (!is_socket(sock)) { UnlockFile((HANDLE)sock, 0, 0, LK_LEN, LK_LEN); @@ -3660,6 +3663,7 @@ rb_w32_close(int fd) } _set_osfhnd(fd, (SOCKET)INVALID_HANDLE_VALUE); _close(fd); + errno = save_errno; if (closesocket(sock) == SOCKET_ERROR) { errno = map_errno(WSAGetLastError()); return -1; |