Commit ff915d45 authored by Francois Gouget's avatar Francois Gouget Committed by Alexandre Julliard

Make sure ip_mreq is not exported by winsock2.h.

Add ip_mreq, ip_mreq_source and ip_msfilter to ws2tcpip.h.
parent 307ee761
......@@ -596,11 +596,13 @@ typedef struct WS(sockaddr_in)
* Multicast group information
*/
#if !defined(__WINE_WINSOCK2__)
struct WS(ip_mreq)
{
struct WS(in_addr) imr_multiaddr;
struct WS(in_addr) imr_interface;
};
#endif
/*
* WSAStartup
......
......@@ -28,6 +28,30 @@
/* FIXME: This gets defined by some Unix (Linux) header and messes things */
#undef s6_addr
/*
* Multicast group information
*/
struct WS(ip_mreq)
{
struct WS(in_addr) imr_multiaddr;
struct WS(in_addr) imr_interface;
};
struct WS(ip_mreq_source) {
struct WS(in_addr) imr_multiaddr;
struct WS(in_addr) imr_sourceaddr;
struct WS(in_addr) imr_interface;
};
struct WS(ip_msfilter) {
struct WS(in_addr) imsf_multiaddr;
struct WS(in_addr) imsf_interface;
u_long imsf_fmode;
u_long imsf_numsrc;
struct WS(in_addr) imsf_slist[1];
};
typedef struct WS(in_addr6)
{
u_char s6_addr[16]; /* IPv6 address */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment