aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorW. Trevor King <wking@tremily.us>2018-07-06 09:37:35 -0700
committerAtomic Bot <atomic-devel@projectatomic.io>2018-07-07 20:35:00 +0000
commit0660108e3e06c9d935f27561eea78d892ba7b3e3 (patch)
tree49c67f5bc41e8863cc7dc65fee95f7a251de9f3f
parent32dd5206064f11edd2f4d103a2bf2c0131b3f179 (diff)
downloadpodman-0660108e3e06c9d935f27561eea78d892ba7b3e3.tar.gz
podman-0660108e3e06c9d935f27561eea78d892ba7b3e3.tar.bz2
podman-0660108e3e06c9d935f27561eea78d892ba7b3e3.zip
ctime: Drop 32-/64-bit distinction on Linux
We added the explicit int64 casts for 32-bit builds in 35e1ad78 (Make libpod build on 32-bit systems, 2018-02-12, #324), but the explicit casts work fine on 64-bit systems too. Signed-off-by: W. Trevor King <wking@tremily.us> Closes: #1058 Approved by: mheon
-rw-r--r--pkg/ctime/ctime_linux.go (renamed from pkg/ctime/ctime_linux_32.go)2
-rw-r--r--pkg/ctime/ctime_linux_64.go14
2 files changed, 1 insertions, 15 deletions
diff --git a/pkg/ctime/ctime_linux_32.go b/pkg/ctime/ctime_linux.go
index 00c1a9a8e..e83269d49 100644
--- a/pkg/ctime/ctime_linux_32.go
+++ b/pkg/ctime/ctime_linux.go
@@ -1,4 +1,4 @@
-// +build arm,linux 386,linux
+// +build linux
package ctime
diff --git a/pkg/ctime/ctime_linux_64.go b/pkg/ctime/ctime_linux_64.go
deleted file mode 100644
index 1251c1ded..000000000
--- a/pkg/ctime/ctime_linux_64.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !arm,!386,linux
-
-package ctime
-
-import (
- "os"
- "syscall"
- "time"
-)
-
-func created(fi os.FileInfo) time.Time {
- st := fi.Sys().(*syscall.Stat_t)
- return time.Unix(st.Ctim.Sec, st.Ctim.Nsec)
-}