From dfd688b6aa7b044f7e7e0662288c66ee1d56e0e8 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Tue, 12 Oct 2021 12:02:10 -0600 Subject: global: remove old-style build tags Signed-off-by: Jason A. Donenfeld --- conn/default.go | 1 - conn/mark_default.go | 1 - conn/mark_unix.go | 1 - device/queueconstants_default.go | 1 - device/queueconstants_ios.go | 1 - device/race_disabled_test.go | 1 - device/race_enabled_test.go | 1 - device/sticky_default.go | 1 - ipc/uapi_bsd.go | 1 - ipc/uapi_unix.go | 1 - ipc/winpipe/file.go | 1 - ipc/winpipe/winpipe.go | 1 - ipc/winpipe/winpipe_test.go | 1 - main.go | 1 - rwcancel/rwcancel.go | 1 - tun/netstack/examples/http_client.go | 1 - tun/netstack/examples/http_server.go | 1 - tun/operateonfd.go | 1 - tun/wintun/dll_fromfile_windows.go | 1 - tun/wintun/dll_fromrsrc_windows.go | 1 - tun/wintun/memmod/memmod_windows_32.go | 1 - tun/wintun/memmod/memmod_windows_64.go | 1 - tun/wintun/memmod/syscall_windows_32.go | 1 - tun/wintun/memmod/syscall_windows_64.go | 1 - 24 files changed, 24 deletions(-) diff --git a/conn/default.go b/conn/default.go index 97bf08c..e65bb74 100644 --- 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 91cf6a8..6e01b0d 100644 --- 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 faa4245..fec154c 100644 --- 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 fa2c055..66ef600 100644 --- 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 21a0e26..854e4c2 100644 --- 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 6552f22..b3db3a1 100644 --- 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 1abba5a..1565100 100644 --- 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 fa39ac0..1038256 100644 --- 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 062f5d7..6deaa87 100644 --- 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 48f6846..57caf21 100644 --- 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 748d7ac..319565f 100644 --- 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 4a435f8..e3719d6 100644 --- 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 20400dd..ea515e3 100644 --- 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 d7181b8..d455983 100644 --- 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 7013b16..59bbe57 100644 --- 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 876e237..6ac2859 100644 --- 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 9420293..577c6ea 100644 --- 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 bc80453..70d8a07 100644 --- 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 31c8cc3..3a1cece 100644 --- 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 96b51c2..0f43097 100644 --- 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 75d7ca1..50e6feb 100644 --- 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 09e6e73..a53851c 100644 --- 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 0072710..f036ecb 100644 --- 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 b475202..6f2c039 100644 --- 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 * -- cgit v1.2.3-59-g8ed1b