From 79cb6e627277c4fda6d1d7d7d50cada3f96c2765 Mon Sep 17 00:00:00 2001
From: ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Fri, 27 Jan 2012 22:34:53 +0000
Subject: 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
---
 libgo/go/os/sys_uname.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'libgo/go/os')

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)
-- 
cgit v1.2.1