kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* win32/win32.c (rb_w32_strerror): unmap some range of errno for

Browse source 
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/trunk@29449 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2010-10-12 06:54:52 +00:00
parent 7587eb706a
commit cba4cda71d
2 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Tue Oct 12 15:52:35 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* 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].
Tue Oct 12 15:36:09 2010 NARUSE, Yui <naruse@ruby-lang.org>
* io.c (rb_io_ungetc): use unsigned int for GB18030.

15
win32/win32.c
View file

@ -2198,6 +2198,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)