summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-12-31 15:02:22 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-12-31 15:02:22 +0000
commita3e1b1ce7ed7e7ffac23015fc2fde56511b30681 (patch)
tree7b725552a9a4ded93849ca2faab1b257f7761790 /win32
parent3e7566d8fb5138bb9cd647e5fdefc54fc9803509 (diff)
* Merge YARV
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
-rw-r--r--win32/win32.c24
1 files changed, 9 insertions, 15 deletions
diff --git a/win32/win32.c b/win32/win32.c
index a50a5f4808..c3702c10b7 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -3012,15 +3012,15 @@ rb_w32_getcwd(char *buffer, int size)
size = len;
if (!p) {
errno = ENOMEM;
- return NULL;
- }
+ return NULL;
+ }
}
if (!GetCurrentDirectory(size, p)) {
errno = map_errno(GetLastError());
if (!buffer)
free(p);
- return NULL;
+ return NULL;
}
for (bp = p; *bp != '\0'; bp = CharNext(bp)) {
@@ -3828,7 +3828,6 @@ rb_w32_Sleep(unsigned long msec)
DWORD ret;
RUBY_CRITICAL(ret = wait_events(NULL, msec));
yield_once();
- CHECK_INTS;
return ret != WAIT_TIMEOUT;
}
@@ -3837,7 +3836,6 @@ catch_interrupt(void)
{
yield_once();
RUBY_CRITICAL(wait_events(NULL, 0));
- CHECK_INTS;
}
#if defined __BORLANDC__ || defined _WIN32_WCE
@@ -3984,10 +3982,6 @@ rb_w32_asynchronize(asynchronous_func_t func, VALUE self,
rb_fatal("failed to launch waiter thread:%d", GetLastError());
}
- if (interrupted) {
- CHECK_INTS;
- }
-
return val;
}
@@ -4150,12 +4144,12 @@ rb_w32_utime(const char *path, const struct utimbuf *times)
}
if (times) {
- if (unixtime_to_filetime(times->actime, &atime)) {
- return -1;
- }
- if (unixtime_to_filetime(times->modtime, &mtime)) {
- return -1;
- }
+ if (unixtime_to_filetime(times->actime, &atime)) {
+ return -1;
+ }
+ if (unixtime_to_filetime(times->modtime, &mtime)) {
+ return -1;
+ }
}
else {
GetSystemTimeAsFileTime(&atime);