Merge pull request #615 from kvasdopil/freebsd-compile2

make libcontainer compile on freebsd (again)
2015-06-05 07:37:07 -07:00 · 2015-06-05 07:37:07 -07:00 · 07493c68a8
parent 57a50dd378 f66187d234
commit 07493c68a8
7 changed files with 13 additions and 4 deletions
--- a/configs/config_linux.go
+++ b/configs/config_linux.go
@ -1,3 +1,5 @@
+// +build freebsd linux
+
 package configs

 import "fmt"
--- a/configs/device_defaults.go
+++ b/configs/device_defaults.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux freebsd

 package configs

--- a/configs/namespaces_linux.go
+++ b/configs/namespaces_linux.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux freebsd

 package configs

--- a/devices/devices_linux.go
+++ b/devices/devices_linux.go
@ -1,3 +1,5 @@
+// +build linux freebsd
+
 package devices

 import (
--- a/devices/number.go
+++ b/devices/number.go
@ -1,4 +1,4 @@
-// +build linux
+// +build linux freebsd

 package devices

--- a/stats_freebsd.go
+++ b/stats_freebsd.go
@ -0,0 +1,5 @@
+package libcontainer
+
+type Stats struct {
+	Interfaces []*NetworkInterface
+}
--- a/system/sysconfig.go
+++ b/system/sysconfig.go
@ -1,4 +1,4 @@
-// +build cgo,linux
+// +build cgo,linux cgo,freebsd

 package system