diff options
| author | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-07-26 01:38:33 +0000 |
|---|---|---|
| committer | ian <ian@138bc75d-0d04-0410-961f-82ee72b054a4> | 2016-07-26 01:38:33 +0000 |
| commit | 98cada78e5430ca047838e0fda0541c293c04d16 (patch) | |
| tree | fc45abfa48cd9a351682f5aa1648ecbea957c5f8 | |
| parent | f4ffbc43eb1927ebc2afddb1c5cf9cccc56e72c1 (diff) | |
| download | gcc-98cada78e5430ca047838e0fda0541c293c04d16.tar.gz | |
os/user: fix Solaris declaration.
Patch from Rainer Orth.
Reviewed-on: https://go-review.googlesource.com/25210
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@238742 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/go/gofrontend/MERGE | 2 | ||||
| -rw-r--r-- | 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 |