From: Alex Brainman <alex.brainman@gmail.com>
Date: Wed, 1 Feb 2012 01:13:46 +0000 (+1100)
Subject: net: fix windows build
X-Git-Tag: weekly.2012-02-07~159
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=238af7700e6e61d75b108d8d67e354b3b2c49aee;p=gostls13.git

net: fix windows build

Ignore result of setting SO_BROADCAST.

Disable TestSimpleListenMulticastUDP as
setIPv4MulticastInterface is not implemented.

R=golang-dev, bradfitz, mikioh.mikioh
CC=golang-dev
https://golang.org/cl/5610044
---

diff --git a/src/pkg/net/multicast_test.go b/src/pkg/net/multicast_test.go
index bf0fe4d8d0..4112f47cb2 100644
--- a/src/pkg/net/multicast_test.go
+++ b/src/pkg/net/multicast_test.go
@@ -86,7 +86,7 @@ func TestListenMulticastUDP(t *testing.T) {
 
 func TestSimpleListenMulticastUDP(t *testing.T) {
 	switch runtime.GOOS {
-	case "plan9":
+	case "plan9", "windows":
 		return
 	}
 
diff --git a/src/pkg/net/sockopt_windows.go b/src/pkg/net/sockopt_windows.go
index 2b861de30b..842bccc8f4 100644
--- a/src/pkg/net/sockopt_windows.go
+++ b/src/pkg/net/sockopt_windows.go
@@ -27,11 +27,7 @@ func setDefaultSockopts(s syscall.Handle, f, t int) error {
 	// to be handled by the correct socket.
 
 	// Allow broadcast.
-	err := syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_BROADCAST, 1)
-	if err != nil {
-		return os.NewSyscallError("setsockopt", err)
-	}
-
+	syscall.SetsockoptInt(s, syscall.SOL_SOCKET, syscall.SO_BROADCAST, 1)
 	return nil
 }