aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2016-07-26 01:38:33 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2016-07-26 01:38:33 +0000
commit870e8ca5a762fa7a9f49ff800e0504f6084b6d20 (patch)
treefc45abfa48cd9a351682f5aa1648ecbea957c5f8
parent4c2726ef992a8f60d742b40a31a12b4bc4d6f3c2 (diff)
downloadgcc-870e8ca5a762fa7a9f49ff800e0504f6084b6d20.zip
gcc-870e8ca5a762fa7a9f49ff800e0504f6084b6d20.tar.gz
gcc-870e8ca5a762fa7a9f49ff800e0504f6084b6d20.tar.bz2
os/user: fix Solaris declaration.
Patch from Rainer Orth. Reviewed-on: https://go-review.googlesource.com/25210 From-SVN: r238742
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--libgo/go/os/user/decls_solaris.go2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 99a68ba..320a091 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-b156d71ad75a1b73d0ed805a5370a297648d9270
+ffd91f9f72fb93147d4ccce9e4c4a59e4c3c2e62
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/libgo/go/os/user/decls_solaris.go b/libgo/go/os/user/decls_solaris.go
index 969b48c..ccdf36b 100644
--- a/libgo/go/os/user/decls_solaris.go
+++ b/libgo/go/os/user/decls_solaris.go
@@ -21,4 +21,4 @@ func libc_getpwuid_r(uid syscall.Uid_t, pwd *syscall.Passwd, buf *byte, buflen s
func libc_getgrnam_r(name *byte, grp *syscall.Group, buf *byte, buflen syscall.Size_t, result **syscall.Group) int
//extern __posix_getgrgid_r
-func libc_getgrgid_r(gid syscall.Gid_t, grp *syscall.group, buf *byte, buflen syscall.Size_t, result **syscall.group) int
+func libc_getgrgid_r(gid syscall.Gid_t, grp *syscall.Group, buf *byte, buflen syscall.Size_t, result **syscall.Group) int