diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-18 11:24:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-18 11:24:58 +0100 |
| commit | f8b04bf56c44411e39e355446c4a311dc9fcb373 (patch) | |
| tree | 50bbd35bb2b90c206e82c74771dbef43593c0d9d /pkg/signal | |
| parent | d72a829f59992dfe29cb84125fde3cce631e6436 (diff) | |
| parent | ea08765f400d828907f231baa84bd880a00d95f1 (diff) | |
| download | podman-f8b04bf56c44411e39e355446c4a311dc9fcb373.tar.gz podman-f8b04bf56c44411e39e355446c4a311dc9fcb373.tar.bz2 podman-f8b04bf56c44411e39e355446c4a311dc9fcb373.zip | |
Merge pull request #13552 from vrothberg/go1.18
go fmt: use go 1.18 conditional-build syntax
Diffstat (limited to 'pkg/signal')
| -rw-r--r-- | pkg/signal/signal_linux.go | 4 | ||||
| -rw-r--r-- | pkg/signal/signal_linux_mipsx.go | 1 | ||||
| -rw-r--r-- | pkg/signal/signal_unix.go | 1 | ||||
| -rw-r--r-- | pkg/signal/signal_unsupported.go | 1 |
4 files changed, 5 insertions, 2 deletions
diff --git a/pkg/signal/signal_linux.go b/pkg/signal/signal_linux.go index 305b9d21f..21e09c9fe 100644 --- a/pkg/signal/signal_linux.go +++ b/pkg/signal/signal_linux.go @@ -1,5 +1,5 @@ -// +build linux -// +build !mips,!mipsle,!mips64,!mips64le +//go:build linux && !mips && !mipsle && !mips64 && !mips64le +// +build linux,!mips,!mipsle,!mips64,!mips64le // Signal handling for Linux only. package signal diff --git a/pkg/signal/signal_linux_mipsx.go b/pkg/signal/signal_linux_mipsx.go index 45c9d5af1..52b07aaf4 100644 --- a/pkg/signal/signal_linux_mipsx.go +++ b/pkg/signal/signal_linux_mipsx.go @@ -1,3 +1,4 @@ +//go:build linux && (mips || mipsle || mips64 || mips64le) // +build linux // +build mips mipsle mips64 mips64le diff --git a/pkg/signal/signal_unix.go b/pkg/signal/signal_unix.go index f35abddc1..c0aa62d21 100644 --- a/pkg/signal/signal_unix.go +++ b/pkg/signal/signal_unix.go @@ -1,3 +1,4 @@ +//go:build aix || darwin || dragonfly || freebsd || netbsd || openbsd || solaris || zos // +build aix darwin dragonfly freebsd netbsd openbsd solaris zos // Signal handling for Linux only. diff --git a/pkg/signal/signal_unsupported.go b/pkg/signal/signal_unsupported.go index 45946f142..d8bba7c90 100644 --- a/pkg/signal/signal_unsupported.go +++ b/pkg/signal/signal_unsupported.go @@ -1,3 +1,4 @@ +//go:build !aix && !darwin && !dragonfly && !freebsd && !linux && !netbsd && !openbsd && !solaris && !zos // +build !aix,!darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!zos // Signal handling for Linux only. |