diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:06:52 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-12-02 08:06:52 +0000 |
| commit | cd504997011c0078df5725ad9b751d05cd83f248 (patch) | |
| tree | 71effdaae8d5ecd2f9cbbcde1288f77d37bc4796 /win32 | |
| parent | 230b8b524da27baaee1ded6bfc8bdef842940400 (diff) | |
merges r29449 from trunk into ruby_1_9_2.
--
* win32/win32.c (rb_w32_strerror): unmap some range of errno for
workaround of VC10's strerror() and sys_nerr problem.
based on a patch from Akio Tajima, [ruby-dev:42355].
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@30039 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/win32.c | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/win32/win32.c b/win32/win32.c index 94b67206b8..69547a5534 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2174,6 +2174,21 @@ rb_w32_strerror(int e) if (e < 0 || e > sys_nerr) { if (e < 0) e = GetLastError(); +#if WSAEWOULDBLOCK != EWOULDBLOCK + else if (e >= EADDRINUSE && e <= EWOULDBLOCK) { + static int s = -1; + int i; + if (s < 0) + for (s = 0; s < (int)(sizeof(errmap)/sizeof(*errmap)); s++) + if (errmap[s].winerr == WSAEWOULDBLOCK) + break; + for (i = s; i < (int)(sizeof(errmap)/sizeof(*errmap)); i++) + if (errmap[i].err == e) { + e = errmap[i].winerr; + break; + } + } +#endif if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | FORMAT_MESSAGE_IGNORE_INSERTS, &source, e, 0, buffer, sizeof(buffer), NULL) == 0) |