archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merges r29449 from trunk into ruby_1_9_2.

Browse source 
--
* 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
This commit is contained in:
yugui 2010-12-02 08:06:52 +00:00
parent 230b8b524d
commit cd50499701
3 changed files with 22 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

15
win32/win32.c
View file

@ -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)