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 /libpod/lock | |
| 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 'libpod/lock')
| -rw-r--r-- | libpod/lock/shm/shm_lock.go | 1 | ||||
| -rw-r--r-- | libpod/lock/shm/shm_lock_nocgo.go | 1 | ||||
| -rw-r--r-- | libpod/lock/shm/shm_lock_test.go | 1 | ||||
| -rw-r--r-- | libpod/lock/shm_lock_manager_linux.go | 1 | ||||
| -rw-r--r-- | libpod/lock/shm_lock_manager_unsupported.go | 1 |
5 files changed, 5 insertions, 0 deletions
diff --git a/libpod/lock/shm/shm_lock.go b/libpod/lock/shm/shm_lock.go index fea02a619..c7f4d1bc5 100644 --- a/libpod/lock/shm/shm_lock.go +++ b/libpod/lock/shm/shm_lock.go @@ -1,3 +1,4 @@ +//go:build linux && cgo // +build linux,cgo package shm diff --git a/libpod/lock/shm/shm_lock_nocgo.go b/libpod/lock/shm/shm_lock_nocgo.go index 627344d9c..31fc02223 100644 --- a/libpod/lock/shm/shm_lock_nocgo.go +++ b/libpod/lock/shm/shm_lock_nocgo.go @@ -1,3 +1,4 @@ +//go:build linux && !cgo // +build linux,!cgo package shm diff --git a/libpod/lock/shm/shm_lock_test.go b/libpod/lock/shm/shm_lock_test.go index cb83c7c2c..8dfc849d6 100644 --- a/libpod/lock/shm/shm_lock_test.go +++ b/libpod/lock/shm/shm_lock_test.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package shm diff --git a/libpod/lock/shm_lock_manager_linux.go b/libpod/lock/shm_lock_manager_linux.go index 8f3b6df7f..3076cd864 100644 --- a/libpod/lock/shm_lock_manager_linux.go +++ b/libpod/lock/shm_lock_manager_linux.go @@ -1,3 +1,4 @@ +//go:build linux // +build linux package lock diff --git a/libpod/lock/shm_lock_manager_unsupported.go b/libpod/lock/shm_lock_manager_unsupported.go index 1d6e3fcbd..d578359ab 100644 --- a/libpod/lock/shm_lock_manager_unsupported.go +++ b/libpod/lock/shm_lock_manager_unsupported.go @@ -1,3 +1,4 @@ +//go:build !linux // +build !linux package lock |