[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 5ffffb42615deb4e274d90f8e7af0a3645eba056
Author: Erich Hoover <ehoover at mines.edu>
Date:   Mon Apr 9 13:06:08 2012 -0600

    ws2_32: Implement IP_UNICAST_IF socket option.
    (cherry picked from commit 313d36d5aa03db464a752eca58df87b628ca80bc)

diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c
index d3a4590..0c2fe0b 100644
--- a/dlls/ws2_32/socket.c
+++ b/dlls/ws2_32/socket.c
@@ -383,6 +383,9 @@ static const int ws_ip_map[][2] =
 #ifdef IP_PKTINFO
     MAP_OPTION( IP_PKTINFO ),
 #endif
+#ifdef IP_UNICAST_IF
+    MAP_OPTION( IP_UNICAST_IF ),
+#endif
 };
 
 static const int ws_ipv6_map[][2] =
@@ -2846,6 +2849,9 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level,
 #endif
         case WS_IP_TOS:
         case WS_IP_TTL:
+#ifdef IP_UNICAST_IF
+        case WS_IP_UNICAST_IF:
+#endif
             if ( (fd = get_sock_fd( s, 0, NULL )) == -1)
                 return SOCKET_ERROR;
             convert_sockopt(&level, &optname);
@@ -4268,6 +4274,9 @@ int WINAPI WS_setsockopt(SOCKET s, int level, int optname,
 #endif
         case WS_IP_TOS:
         case WS_IP_TTL:
+#ifdef IP_UNICAST_IF
+        case WS_IP_UNICAST_IF:
+#endif
             convert_sockopt(&level, &optname);
             break;
         case WS_IP_DONTFRAGMENT:

-- 
Debian Wine packaging