Bladeren bron

Merge pull request #639 from fsouza/fix-utils-darwin

utils: fix compilation on Darwin
Guillaume J. Charmes 12 jaren geleden
bovenliggende
commit
2879ef4642
2 gewijzigde bestanden met toevoegingen van 8 en 4 verwijderingen
  1. 5 2
      utils/uname_darwin.go
  2. 3 2
      utils/uname_linux.go

+ 5 - 2
utils/uname_darwin.go

@@ -2,9 +2,12 @@ package utils
 
 
 import (
 import (
 	"errors"
 	"errors"
-	"syscall"
 )
 )
 
 
-func uname() (*syscall.Utsname, error) {
+type Utsname struct {
+	Release [65]byte
+}
+
+func uname() (*Utsname, error) {
 	return nil, errors.New("Kernel version detection is not available on darwin")
 	return nil, errors.New("Kernel version detection is not available on darwin")
 }
 }

+ 3 - 2
utils/uname_linux.go

@@ -4,8 +4,9 @@ import (
 	"syscall"
 	"syscall"
 )
 )
 
 
-// FIXME: Move this to utils package
-func uname() (*syscall.Utsname, error) {
+type Utsname syscall.Utsname
+
+func uname() (*Utsname, error) {
 	uts := &syscall.Utsname{}
 	uts := &syscall.Utsname{}
 
 
 	if err := syscall.Uname(uts); err != nil {
 	if err := syscall.Uname(uts); err != nil {