system/wine
system/wine
1
0
Fork 0
mirror of https://github.com/wine-mirror/wine synced 2024-07-08 20:06:18 +00:00
Code Issues Projects Releases Wiki Activity

Make sure ip_mreq is not exported by winsock2.h.

Browse Source 
Add ip_mreq, ip_mreq_source and ip_msfilter to ws2tcpip.h.
This commit is contained in:
Francois Gouget 2004-03-31 19:58:46 +00:00 committed by Alexandre Julliard
parent 307ee761ef
commit ff915d457b
2 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/winsock.h
View File

@ -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

24
include/ws2tcpip.h
View File

@ -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 */