diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-22 01:01:27 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-07-22 01:01:27 +0000 |
| commit | 29f737177b2969066ab63429885dfe84c36d4bdf (patch) | |
| tree | 0f26bccea7d9c2e85e007af1212bffe643533da7 | |
| parent | a530e8501ed931a2f5e8c1bea5803a4c067f6db3 (diff) | |
| download | ruby-29f737177b2969066ab63429885dfe84c36d4bdf.tar.gz ruby-29f737177b2969066ab63429885dfe84c36d4bdf.tar.xz ruby-29f737177b2969066ab63429885dfe84c36d4bdf.zip | |
* win32/win32.c (WSABUF): get rid of compile error on VC9 and mingw.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | win32/win32.c | 4 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Wed Jul 22 10:00:53 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * win32/win32.c (WSABUF): get rid of compile error on VC9 and mingw. + Wed Jul 22 02:33:57 2009 Keiju Ishitsuka <keiju@emperor2.pendome> * lib/irb.rb: forget svn commit. diff --git a/win32/win32.c b/win32/win32.c index 6b5bd304b..02645b2d9 100644 --- a/win32/win32.c +++ b/win32/win32.c @@ -2816,7 +2816,7 @@ rb_w32_sendto(int fd, const char *buf, int len, int flags, (struct sockaddr *)to, &tolen); } -#ifndef WSAID_WSARECVMSG +#if !defined(MSG_TRUNC) && !defined(__MINGW32__) typedef struct { SOCKADDR *name; int namelen; @@ -2825,6 +2825,8 @@ typedef struct { WSABUF Control; DWORD dwFlags; } WSAMSG; +#endif +#ifndef WSAID_WSARECVMSG #define WSAID_WSARECVMSG {0xf689d7c8,0x6f1f,0x436b,{0x8a,0x53,0xe5,0x4f,0xe3,0x51,0xc3,0x22}} #endif #ifndef WSAID_WSASENDMSG |