Merge pull request docker-archive#615 from kvasdopil/freebsd-compile2

make libcontainer compile on freebsd (again)
crosbymichael · Jun 5, 2015 · 07493c6 · 07493c6
2 parents 57a50dd + f66187d
commit 07493c6
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 4 deletions.
diff --git a/configs/config_linux.go → configs/config_unix.go b/configs/config_linux.go → configs/config_unix.go
@@ -1,3 +1,5 @@
+// +build freebsd linux
+
 package configs
 
 import "fmt"

diff --git a/configs/device_defaults.go b/configs/device_defaults.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux freebsd
 
 package configs
 

diff --git a/configs/namespaces_linux.go → configs/namespaces_unix.go b/configs/namespaces_linux.go → configs/namespaces_unix.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux freebsd
 
 package configs
 

diff --git a/devices/devices_linux.go → devices/devices_unix.go b/devices/devices_linux.go → devices/devices_unix.go
@@ -1,3 +1,5 @@
+// +build linux freebsd
+
 package devices
 
 import (

diff --git a/devices/number.go b/devices/number.go
@@ -1,4 +1,4 @@
-// +build linux
+// +build linux freebsd
 
 package devices
 

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