kotovalexarian-likes-github
/
moby--moby
mirror of https://github.com/moby/moby.git
1
0
Fork 0
Code Releases Activity

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

utils: fix compilation on Darwin
This commit is contained in:
Guillaume J. Charmes 2013-05-20 10:10:30 -07:00
parent b3101beb47 2b55874584
commit 2879ef4642
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
utils/uname_darwin.go
View File

@ -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")
} }

5
utils/uname_linux.go
View File

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