1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* include/ruby/win32.h, win32/win32.c (EWOULDBLOCK): VC10 already

Browse Source 
defined EWOULDBLOCK.  based on a patch from Charlie Savage,
  see [ruby-core:29255]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27222 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2010-04-05 04:26:33 +00:00
parent 10c9ed2493
commit 54da3ecbcb
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
Mon Apr 5 13:20:45 2010 NAKAMURA Usaku <usa@ruby-lang.org>
* include/ruby/win32.h, win32/win32.c (EWOULDBLOCK): VC10 already
defined EWOULDBLOCK. based on a patch from Charlie Savage,
see [ruby-core:29255]
Mon Apr 5 13:10:35 2010 NARUSE, Yui <naruse@ruby-lang.org> Mon Apr 5 13:10:35 2010 NARUSE, Yui <naruse@ruby-lang.org>
* ext/psych/lib/psych/core_ext.rb: remove before alias. * ext/psych/lib/psych/core_ext.rb: remove before alias.

2
include/ruby/win32.h
View File

@ -401,7 +401,9 @@ extern char *rb_w32_strerror(int);
/* #undef va_end */ /* #undef va_end */
/* winsock error map */ /* winsock error map */
#ifndef EWOULDBLOCK /* VC10 has this */
#define EWOULDBLOCK WSAEWOULDBLOCK #define EWOULDBLOCK WSAEWOULDBLOCK
#endif
#define EINPROGRESS WSAEINPROGRESS #define EINPROGRESS WSAEINPROGRESS
#define EALREADY WSAEALREADY #define EALREADY WSAEALREADY
#define ENOTSOCK WSAENOTSOCK #define ENOTSOCK WSAENOTSOCK

3
win32/win32.c
View File

@ -161,7 +161,7 @@ static struct {
{ ERROR_PIPE_NOT_CONNECTED, EPIPE }, { ERROR_PIPE_NOT_CONNECTED, EPIPE },
{ ERROR_OPERATION_ABORTED, EINTR }, { ERROR_OPERATION_ABORTED, EINTR },
{ ERROR_NOT_ENOUGH_QUOTA, ENOMEM }, { ERROR_NOT_ENOUGH_QUOTA, ENOMEM },
{ ERROR_MOD_NOT_FOUND, ENOENT }, { ERROR_MOD_NOT_FOUND, ENOENT },
{ WSAENAMETOOLONG, ENAMETOOLONG }, { WSAENAMETOOLONG, ENAMETOOLONG },
{ WSAENOTEMPTY, ENOTEMPTY }, { WSAENOTEMPTY, ENOTEMPTY },
{ WSAEINTR, EINTR }, { WSAEINTR, EINTR },
@ -170,6 +170,7 @@ static struct {
{ WSAEFAULT, EFAULT }, { WSAEFAULT, EFAULT },
{ WSAEINVAL, EINVAL }, { WSAEINVAL, EINVAL },
{ WSAEMFILE, EMFILE }, { WSAEMFILE, EMFILE },
{ WSAEWOULDBLOCK, EWOULDBLOCK },
}; };
int int