net: fix windows build

R=golang-dev, r2
CC=golang-dev
https://golang.org/cl/4184051

diff --git a/src/pkg/net/multicast_test.go b/src/pkg/net/multicast_test.go
index 0c9a0355e6478d78a2cbd20b1087b7ce15a09cc0..06d430e90b9393fac361c1e78bec45b9e042590a 100644 (file)
--- a/src/pkg/net/multicast_test.go
+++ b/src/pkg/net/multicast_test.go
@@ -5,10 +5,14 @@
 package net
 
 import (
+       "runtime"
        "testing"
 )
 
 func TestMulticastJoinAndLeave(t *testing.T) {
+       if runtime.GOOS == "windows" {
+               return
+       }
        addr := &UDPAddr{
                IP:   IPv4zero,
                Port: 0,

diff --git a/src/pkg/syscall/syscall_windows.go b/src/pkg/syscall/syscall_windows.go
index 658e94c0f3c093efbc7bcc80a21f0709ff077624..e194feae30e3e6c424e7e40319adc9aab1b5f64b 100644 (file)
--- a/src/pkg/syscall/syscall_windows.go
+++ b/src/pkg/syscall/syscall_windows.go
@@ -703,8 +703,19 @@ type Linger struct {
        Linger int32
 }
 
-func SetsockoptLinger(fd, level, opt int, l *Linger) (errno int) { return EWINDOWS }
-func BindToDevice(fd int, device string) (errno int)             { return EWINDOWS }
+const (
+       IP_ADD_MEMBERSHIP = iota
+       IP_DROP_MEMBERSHIP
+)
+
+type IpMreq struct {
+       Multiaddr [4]byte /* in_addr */
+       Interface [4]byte /* in_addr */
+}
+
+func SetsockoptLinger(fd, level, opt int, l *Linger) (errno int)    { return EWINDOWS }
+func SetsockoptIpMreq(fd, level, opt int, mreq *IpMreq) (errno int) { return EWINDOWS }
+func BindToDevice(fd int, device string) (errno int)                { return EWINDOWS }
 
 // TODO(brainman): fix all needed for os