diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-05 04:26:33 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2010-04-05 04:26:33 +0000 |
| commit | 54da3ecbcbfd6cda2451da9aceafb3ef72a1c70e (patch) | |
| tree | e98b7c8b5a90c69e850cb290daa6ad8c87a71635 /include/ruby/win32.h | |
| parent | 10c9ed249320165a4a8ec2f70cade2f1c90f2bcd (diff) | |
* include/ruby/win32.h, win32/win32.c (EWOULDBLOCK): VC10 already
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
Diffstat (limited to 'include/ruby/win32.h')
| -rw-r--r-- | include/ruby/win32.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/ruby/win32.h b/include/ruby/win32.h index aa8b2c26ce..ec3385a33f 100644 --- a/include/ruby/win32.h +++ b/include/ruby/win32.h @@ -401,7 +401,9 @@ extern char *rb_w32_strerror(int); /* #undef va_end */ /* winsock error map */ +#ifndef EWOULDBLOCK /* VC10 has this */ #define EWOULDBLOCK WSAEWOULDBLOCK +#endif #define EINPROGRESS WSAEINPROGRESS #define EALREADY WSAEALREADY #define ENOTSOCK WSAENOTSOCK |