diff options
author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-27 22:34:53 +0000 |
---|---|---|
committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-01-27 22:34:53 +0000 |
commit | 79cb6e627277c4fda6d1d7d7d50cada3f96c2765 (patch) | |
tree | 149a42f0bddeff40c4a94a4b7a752b94f2c612dd /libgo/go/os | |
parent | c307f1064fa0315692c3dcdd800435d5895b234d (diff) | |
download | gcc-79cb6e627277c4fda6d1d7d7d50cada3f96c2765.tar.gz |
libgo: Fix merge errors shown on Solaris.
From Rainer Orth.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@183651 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/go/os')
-rw-r--r-- | libgo/go/os/sys_uname.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libgo/go/os/sys_uname.go b/libgo/go/os/sys_uname.go index 313ee62aef6..16568b69f4b 100644 --- a/libgo/go/os/sys_uname.go +++ b/libgo/go/os/sys_uname.go @@ -8,7 +8,7 @@ package os import "syscall" -func Hostname() (name string, err error) { +func hostname() (name string, err error) { var u syscall.Utsname if errno := syscall.Uname(&u); errno != nil { return "", NewSyscallError("uname", errno) |