From 870e8ca5a762fa7a9f49ff800e0504f6084b6d20 Mon Sep 17 00:00:00 2001 From: Ian Lance Taylor Date: Tue, 26 Jul 2016 01:38:33 +0000 Subject: [PATCH] os/user: fix Solaris declaration. Patch from Rainer Orth. Reviewed-on: https://go-review.googlesource.com/25210 From-SVN: r238742 --- gcc/go/gofrontend/MERGE | 2 +- libgo/go/os/user/decls_solaris.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE index 99a68baee78..320a0913120 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 969b48c9e80..ccdf36b13d6 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 -- 2.30.2