From 10aee181995363b41f712a55844a0dd52ea04646 Mon Sep 17 00:00:00 2001 From: Mikio Hara Date: Tue, 6 Nov 2018 12:02:00 +0900 Subject: [PATCH] icmp, ipv4, ipv6: re-adjust build constraints Also updates package documentation for AIX. Change-Id: I4809a334f0a4b8f3fb5345749477394b8f3e7546 Reviewed-on: https://go-review.googlesource.com/c/147678 Run-TryBot: Mikio Hara TryBot-Result: Gobot Gobot Reviewed-by: Brad Fitzpatrick --- icmp/message.go | 3 ++- ipv4/doc.go | 3 ++- ipv4/payload_cmsg.go | 2 +- ipv4/payload_cmsg_go1_8.go | 2 +- ipv4/payload_cmsg_go1_9.go | 2 +- ipv4/payload_nocmsg.go | 2 +- ipv6/doc.go | 3 ++- ipv6/payload_cmsg.go | 2 +- ipv6/payload_cmsg_go1_8.go | 2 +- ipv6/payload_cmsg_go1_9.go | 2 +- ipv6/payload_nocmsg.go | 2 +- 11 files changed, 14 insertions(+), 11 deletions(-) diff --git a/icmp/message.go b/icmp/message.go index 75aac6c5..b7883cc9 100644 --- a/icmp/message.go +++ b/icmp/message.go @@ -24,7 +24,8 @@ import ( "golang.org/x/net/ipv6" ) -// BUG(mikio): This package is not implemented on JS, NaCl and Plan 9. +// BUG(mikio): This package is not implemented on AIX, JS, NaCl and +// Plan 9. var ( errInvalidConn = errors.New("invalid connection") diff --git a/ipv4/doc.go b/ipv4/doc.go index 3efa2903..863d55b8 100644 --- a/ipv4/doc.go +++ b/ipv4/doc.go @@ -241,4 +241,5 @@ // IncludeSourceSpecificGroup may return an error. package ipv4 // import "golang.org/x/net/ipv4" -// BUG(mikio): This package is not implemented on JS, NaCl and Plan 9. +// BUG(mikio): This package is not implemented on AIX, JS, NaCl and +// Plan 9. diff --git a/ipv4/payload_cmsg.go b/ipv4/payload_cmsg.go index 204a49fe..a7c892dc 100644 --- a/ipv4/payload_cmsg.go +++ b/ipv4/payload_cmsg.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 !js,!nacl,!plan9,!windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package ipv4 diff --git a/ipv4/payload_cmsg_go1_8.go b/ipv4/payload_cmsg_go1_8.go index 8d45599f..15a27b7a 100644 --- a/ipv4/payload_cmsg_go1_8.go +++ b/ipv4/payload_cmsg_go1_8.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // +build !go1.9 -// +build !js,!nacl,!plan9,!windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package ipv4 diff --git a/ipv4/payload_cmsg_go1_9.go b/ipv4/payload_cmsg_go1_9.go index 4081aad8..aab3b224 100644 --- a/ipv4/payload_cmsg_go1_9.go +++ b/ipv4/payload_cmsg_go1_9.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // +build go1.9 -// +build !js,!nacl,!plan9,!windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package ipv4 diff --git a/ipv4/payload_nocmsg.go b/ipv4/payload_nocmsg.go index 1d434c61..d57f05c1 100644 --- a/ipv4/payload_nocmsg.go +++ b/ipv4/payload_nocmsg.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 js nacl plan9 windows +// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris package ipv4 diff --git a/ipv6/doc.go b/ipv6/doc.go index e0be9d50..d38ea0da 100644 --- a/ipv6/doc.go +++ b/ipv6/doc.go @@ -240,4 +240,5 @@ // IncludeSourceSpecificGroup may return an error. package ipv6 // import "golang.org/x/net/ipv6" -// BUG(mikio): This package is not implemented on JS, NaCl and Plan 9. +// BUG(mikio): This package is not implemented on AIX, JS, NaCl and +// Plan 9. diff --git a/ipv6/payload_cmsg.go b/ipv6/payload_cmsg.go index 3f23b5d2..e17847d0 100644 --- a/ipv6/payload_cmsg.go +++ b/ipv6/payload_cmsg.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 !js,!nacl,!plan9,!windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package ipv6 diff --git a/ipv6/payload_cmsg_go1_8.go b/ipv6/payload_cmsg_go1_8.go index bc4209db..a48a6ed6 100644 --- a/ipv6/payload_cmsg_go1_8.go +++ b/ipv6/payload_cmsg_go1_8.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // +build !go1.9 -// +build !js,!nacl,!plan9,!windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package ipv6 diff --git a/ipv6/payload_cmsg_go1_9.go b/ipv6/payload_cmsg_go1_9.go index 7dd65048..fb196ed8 100644 --- a/ipv6/payload_cmsg_go1_9.go +++ b/ipv6/payload_cmsg_go1_9.go @@ -3,7 +3,7 @@ // license that can be found in the LICENSE file. // +build go1.9 -// +build !js,!nacl,!plan9,!windows +// +build darwin dragonfly freebsd linux netbsd openbsd solaris package ipv6 diff --git a/ipv6/payload_nocmsg.go b/ipv6/payload_nocmsg.go index 459142d2..bfb54478 100644 --- a/ipv6/payload_nocmsg.go +++ b/ipv6/payload_nocmsg.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 js nacl plan9 windows +// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris package ipv6