net, internal/poll: enable ListenMulticastUDP on solaris

Fixes #20898.

Change-Id: Ib3a8da34851d8b3681a6802e509fe712d6982df2
Reviewed-on: https://go-review.googlesource.com/47450
Run-TryBot: Mikio Hara <mikioh.mikioh@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Ian Lance Taylor <iant@golang.org>
Reviewed-by: Avelino <t@avelino.xxx>

diff --git a/src/internal/poll/sockoptip.go b/src/internal/poll/sockoptip.go
index 5d5dff6ebc935083b542e2f389ce694117f24fb3..1ee490c257876f78b6ad32b0b0734f5edeb3d425 100644 (file)
--- a/src/internal/poll/sockoptip.go
+++ b/src/internal/poll/sockoptip.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
 
 package poll
 

diff --git a/src/net/sockoptip_bsd.go b/src/net/sockoptip_bsdvar.go
similarity index 93%
rename from src/net/sockoptip_bsd.go
rename to src/net/sockoptip_bsdvar.go
index b11f3a4edbe241fb1bc8692a1e869534941884c1..956010139878fcda7328c0d43f6120b73de47e9e 100644 (file)
--- a/src/net/sockoptip_bsd.go
+++ b/src/net/sockoptip_bsdvar.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd netbsd openbsd
+// +build darwin dragonfly freebsd netbsd openbsd solaris
 
 package net
 

diff --git a/src/net/sockoptip_posix.go b/src/net/sockoptip_posix.go
index 4e10f2a6a5e9c2752f7823c398e001f772cb1345..5d3077e552dcc850d032466dc0f16fc2e28cded6 100644 (file)
--- a/src/net/sockoptip_posix.go
+++ b/src/net/sockoptip_posix.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin dragonfly freebsd linux netbsd openbsd windows
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
 
 package net
 

diff --git a/src/net/sockoptip_stub.go b/src/net/sockoptip_stub.go
index f698687514df9dbd26b1e05aa906f0cbc535bb0b..fc20a9fc33139ccd2fb8351fe75ecb459af06524 100644 (file)
--- a/src/net/sockoptip_stub.go
+++ b/src/net/sockoptip_stub.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build nacl solaris
+// +build nacl
 
 package net