Add ip_mreq to ws2tcpip.h

[Francois Gouget]

Changelog:

 * include/winsock.h
   include/ws2tcpip.h

   Make sure ip_mreq is not exported by winsock2.h
   Add ip_mreq, ip_mreq_source and ip_msfilter to ws2tcpip.h


Index: include/winsock.h
===================================================================
RCS file: /var/cvs/wine/include/winsock.h,v
retrieving revision 1.64
diff -u -r1.64 winsock.h
--- a/include/winsock.h	25 Mar 2004 23:36:26 -0000	1.64
+++ b/include/winsock.h	28 Mar 2004 13:18:40 -0000
@@ -596,11 +596,13 @@
  * 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
Index: include/ws2tcpip.h
===================================================================
RCS file: /var/cvs/wine/include/ws2tcpip.h,v
retrieving revision 1.3
diff -u -r1.3 ws2tcpip.h
--- a/include/ws2tcpip.h	4 Apr 2003 22:04:47 -0000	1.3
+++ b/include/ws2tcpip.h	25 Mar 2004 22:07:04 -0000
@@ -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 */


-- 
Francois Gouget         fgouget at free.fr        http://fgouget.free.fr/
In theory, theory and practice are the same, but in practice they're different.