global: remove old-style build tags

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

diff --git a/conn/default.go b/conn/default.go
index 97bf08c22218a78e10027f12e74697b1e50bb680..e65bb7474ff38f56737759aee7620d3d0478ddde 100644 (file)
--- a/conn/default.go
+++ b/conn/default.go
@@ -1,5 +1,4 @@
 //go:build !linux && !windows
-// +build !linux,!windows
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/conn/mark_default.go b/conn/mark_default.go
index 91cf6a8143f7234a10bbb91ee25675cdcef1f941..6e01b0d642c87c90374cc6d2637ae1f1877cd8bc 100644 (file)
--- a/conn/mark_default.go
+++ b/conn/mark_default.go
@@ -1,5 +1,4 @@
 //go:build !linux && !openbsd && !freebsd
-// +build !linux,!openbsd,!freebsd
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/conn/mark_unix.go b/conn/mark_unix.go
index faa42453edd5530463cb733a1bfaafdd60298bab..fec154c9a48ce7d94b7307cd749af11c9e433d99 100644 (file)
--- a/conn/mark_unix.go
+++ b/conn/mark_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || openbsd || freebsd
-// +build linux openbsd freebsd
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/device/queueconstants_default.go b/device/queueconstants_default.go
index fa2c0552c0e953508142cecba0ec8945c74f9016..66ef600d24be035e7764761e9b39fec7a789547d 100644 (file)
--- a/device/queueconstants_default.go
+++ b/device/queueconstants_default.go
@@ -1,5 +1,4 @@
 //go:build !android && !ios && !windows
-// +build !android,!ios,!windows
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/device/queueconstants_ios.go b/device/queueconstants_ios.go
index 21a0e2663e59864647ae23de1c1abe3c428a90a6..854e4c26ef63a912aea7cd4a3c7cc889a02b0da5 100644 (file)
--- a/device/queueconstants_ios.go
+++ b/device/queueconstants_ios.go
@@ -1,5 +1,4 @@
 //go:build ios
-// +build ios
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/device/race_disabled_test.go b/device/race_disabled_test.go
index 6552f22e32a661aa9e26a50eceb8e21ec2cc7c4d..b3db3a1f077375ddb6740a3ec16daac2d3052aff 100644 (file)
--- a/device/race_disabled_test.go
+++ b/device/race_disabled_test.go
@@ -1,5 +1,4 @@
 //go:build !race
-// +build !race
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/device/race_enabled_test.go b/device/race_enabled_test.go
index 1abba5afb87d8a71296f82ed656233ad487ec01f..1565100fc4e07798d108a3b98c3d77af33689fc8 100644 (file)
--- a/device/race_enabled_test.go
+++ b/device/race_enabled_test.go
@@ -1,5 +1,4 @@
 //go:build race
-// +build race
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/device/sticky_default.go b/device/sticky_default.go
index fa39ac0d031e2231e24e985f1c14426320b53828..10382565efe371cb8d456c7c4774dbfe041ab18a 100644 (file)
--- a/device/sticky_default.go
+++ b/device/sticky_default.go
@@ -1,5 +1,4 @@
 //go:build !linux
-// +build !linux
 
 package device
 

diff --git a/ipc/uapi_bsd.go b/ipc/uapi_bsd.go
index 062f5d77feccfc38b1161917bcd050afd7f6ccd6..6deaa87bbb670219875ace6b068c7467202ccc38 100644 (file)
--- a/ipc/uapi_bsd.go
+++ b/ipc/uapi_bsd.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd || openbsd
-// +build darwin freebsd openbsd
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/ipc/uapi_unix.go b/ipc/uapi_unix.go
index 48f6846ae524ab31cf690092aeff58d59e37180d..57caf2160d029e2a6abbdfcb4a77894260f2fc84 100644 (file)
--- a/ipc/uapi_unix.go
+++ b/ipc/uapi_unix.go
@@ -1,5 +1,4 @@
 //go:build linux || darwin || freebsd || openbsd
-// +build linux darwin freebsd openbsd
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/ipc/winpipe/file.go b/ipc/winpipe/file.go
index 748d7ac91a913103b977539cd29a6d6d2e91673c..319565f826512965483ba78d9aa3f7caa226d61d 100644 (file)
--- a/ipc/winpipe/file.go
+++ b/ipc/winpipe/file.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/ipc/winpipe/winpipe.go b/ipc/winpipe/winpipe.go
index 4a435f8c2aa1c216a83dbe2933f4e936b776d092..e3719d69e3880959da1d05575e136d66d50f6d4c 100644 (file)
--- a/ipc/winpipe/winpipe.go
+++ b/ipc/winpipe/winpipe.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/ipc/winpipe/winpipe_test.go b/ipc/winpipe/winpipe_test.go
index 20400dde0d872f10b6ab2206985e79014516adfd..ea515e3e071e06b30b33b678d0a5706c998a2086 100644 (file)
--- a/ipc/winpipe/winpipe_test.go
+++ b/ipc/winpipe/winpipe_test.go
@@ -1,5 +1,4 @@
 //go:build windows
-// +build windows
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/main.go b/main.go
index d7181b8bc2b85fe491138e30951abceb5d0d2a14..d455983723097808e73a70bff266bd03ff85ccd0 100644 (file)
--- a/main.go
+++ b/main.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/rwcancel/rwcancel.go b/rwcancel/rwcancel.go
index 7013b16d8fbb1a83644fd514ddc15c08072fedbd..59bbe57d9ca9d7c3da8f5c7b8c42dbbf74317e77 100644 (file)
--- a/rwcancel/rwcancel.go
+++ b/rwcancel/rwcancel.go
@@ -1,5 +1,4 @@
 //go:build !windows
-// +build !windows
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/netstack/examples/http_client.go b/tun/netstack/examples/http_client.go
index 876e2378d16ee0c7f80de9168592cefdf06e3cff..6ac28596b67ed275f11c2228ff2e42c7f463ee6b 100644 (file)
--- a/tun/netstack/examples/http_client.go
+++ b/tun/netstack/examples/http_client.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/netstack/examples/http_server.go b/tun/netstack/examples/http_server.go
index 94202933281ffe01514bbad633acd63c6463da70..577c6ea4cd7dda332f64859ce787791ae8f70583 100644 (file)
--- a/tun/netstack/examples/http_server.go
+++ b/tun/netstack/examples/http_server.go
@@ -1,5 +1,4 @@
 //go:build ignore
-// +build ignore
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/operateonfd.go b/tun/operateonfd.go
index bc804539169f484df97831a0cfe1607006fe810b..70d8a075bbd65bccc3593d52e099aec6cefc6e79 100644 (file)
--- a/tun/operateonfd.go
+++ b/tun/operateonfd.go
@@ -1,5 +1,4 @@
 //go:build darwin || freebsd
-// +build darwin freebsd
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/wintun/dll_fromfile_windows.go b/tun/wintun/dll_fromfile_windows.go
index 31c8cc38bcf376c1d2ea16ed48c7afc7fca6041f..3a1cece6bacbd0c474f487c8109ac7f130a3a39f 100644 (file)
--- a/tun/wintun/dll_fromfile_windows.go
+++ b/tun/wintun/dll_fromfile_windows.go
@@ -1,5 +1,4 @@
 //go:build !load_wintun_from_rsrc
-// +build !load_wintun_from_rsrc
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/wintun/dll_fromrsrc_windows.go b/tun/wintun/dll_fromrsrc_windows.go
index 96b51c21b4669797e6e69384b1ad50840882a57b..0f43097b63f127fe040d62f5793d5ba2489b1406 100644 (file)
--- a/tun/wintun/dll_fromrsrc_windows.go
+++ b/tun/wintun/dll_fromrsrc_windows.go
@@ -1,5 +1,4 @@
 //go:build load_wintun_from_rsrc
-// +build load_wintun_from_rsrc
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/wintun/memmod/memmod_windows_32.go b/tun/wintun/memmod/memmod_windows_32.go
index 75d7ca1bb9c58917762b98d72021fdbf457734c0..50e6febf01482c1d72e09d82b45544a4f9463205 100644 (file)
--- a/tun/wintun/memmod/memmod_windows_32.go
+++ b/tun/wintun/memmod/memmod_windows_32.go
@@ -1,5 +1,4 @@
 //go:build (windows && 386) || (windows && arm)
-// +build windows,386 windows,arm
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/wintun/memmod/memmod_windows_64.go b/tun/wintun/memmod/memmod_windows_64.go
index 09e6e73ad4e7aa2cf6a179221040aa3a54f6b973..a53851c6b55ead250e7833854176196d0f54b809 100644 (file)
--- a/tun/wintun/memmod/memmod_windows_64.go
+++ b/tun/wintun/memmod/memmod_windows_64.go
@@ -1,5 +1,4 @@
 //go:build (windows && amd64) || (windows && arm64)
-// +build windows,amd64 windows,arm64
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/wintun/memmod/syscall_windows_32.go b/tun/wintun/memmod/syscall_windows_32.go
index 007271088ee8375d65687e7fd7eda33c1b91a384..f036ecb88bbfa407c293c95f19c20a372332c411 100644 (file)
--- a/tun/wintun/memmod/syscall_windows_32.go
+++ b/tun/wintun/memmod/syscall_windows_32.go
@@ -1,5 +1,4 @@
 //go:build (windows && 386) || (windows && arm)
-// +build windows,386 windows,arm
 
 /* SPDX-License-Identifier: MIT
  *

diff --git a/tun/wintun/memmod/syscall_windows_64.go b/tun/wintun/memmod/syscall_windows_64.go
index b4752025a1fca284fd9a19bc938ff93879b6d592..6f2c03967fefe48a19b08e4c2a1121e304b1af36 100644 (file)
--- a/tun/wintun/memmod/syscall_windows_64.go
+++ b/tun/wintun/memmod/syscall_windows_64.go
@@ -1,5 +1,4 @@
 //go:build (windows && amd64) || (windows && arm64)
-// +build windows,amd64 windows,arm64
 
 /* SPDX-License-Identifier: MIT
  *