[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690

[Alexandre Julliard]

The following commit has been merged in the wheezy branch:
commit 911be2d44da7220c8db3384777f58e45772ab7bd
Author: Erich Hoover <ehoover at mines.edu>
Date:   Mon Apr 9 13:06:30 2012 -0600

    ws2_32: Implement IPV6_UNICAST_IF socket option.
    (cherry picked from commit 1d49c6692991bbbd102102a508b2409e5e5f5f0f)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index 0c2fe0b..7356ab0 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -401,6 +401,9 @@ static const int ws_ipv6_map[][2] =
     MAP_OPTION( IPV6_MULTICAST_LOOP ),
     MAP_OPTION( IPV6_UNICAST_HOPS ),
     MAP_OPTION( IPV6_V6ONLY ),
+#ifdef IPV6_UNICAST_IF
+    MAP_OPTION( IPV6_UNICAST_IF ),
+#endif
 };
 
 static const int ws_af_map[][2] =
@@ -2884,6 +2887,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
         case WS_IPV6_MULTICAST_LOOP:
         case WS_IPV6_UNICAST_HOPS:
         case WS_IPV6_V6ONLY:
+#ifdef IPV6_UNICAST_IF
+        case WS_IPV6_UNICAST_IF:
+#endif
             if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
                 return SOCKET_ERROR;
             convert_sockopt(&level, &optname);
@@ -4302,6 +4308,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
         case WS_IPV6_MULTICAST_LOOP:
         case WS_IPV6_UNICAST_HOPS:
         case WS_IPV6_V6ONLY:
+#ifdef IPV6_UNICAST_IF
+        case WS_IPV6_UNICAST_IF:
+#endif
             convert_sockopt(&level, &optname);
             break;
         case WS_IPV6_DONTFRAG:

-- 
Debian Wine packaging