From 681dce6bfefc2f4cb4adedce884e91d97e50b321 Mon Sep 17 00:00:00 2001 From: usa Date: Wed, 22 Jul 2009 01:01:27 +0000 Subject: * win32/win32.c (WSABUF): get rid of compile error on VC9 and mingw. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24235 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ win32/win32.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 4af54c8293..79d6ca9d9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Wed Jul 22 10:00:53 2009 NAKAMURA Usaku + + * win32/win32.c (WSABUF): get rid of compile error on VC9 and mingw. + Wed Jul 22 02:33:57 2009 Keiju Ishitsuka * lib/irb.rb: forget svn commit. diff --git a/win32/win32.c b/win32/win32.c index 6b5bd304b9..02645b2d93 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 -- cgit v1.2.3