cgo: avoid "incompatible pointer type" warning

R=rsc
CC=golang-dev
https://golang.org/cl/4409041

diff --git a/src/cmd/cgo/out.go b/src/cmd/cgo/out.go
index abf8c8bc203f975126882160cba2dda00dbd15b6..bbc319f103c1e65431d7bd8126ebfa78b91357ff 100644 (file)
--- a/src/cmd/cgo/out.go
+++ b/src/cmd/cgo/out.go
@@ -312,8 +312,11 @@ func (p *Package) writeOutputFunc(fgcc *os.File, n *Name) {
        }
        fmt.Fprintf(fgcc, "\t%s *a = v;\n", ctype)
        fmt.Fprintf(fgcc, "\t")
-       if n.FuncType.Result != nil {
+       if t := n.FuncType.Result; t != nil {
                fmt.Fprintf(fgcc, "a->r = ")
+               if c := t.C.String(); c[len(c)-1] == '*' {
+                       fmt.Fprintf(fgcc, "(const %s) ", t.C)
+               }
        }
        fmt.Fprintf(fgcc, "%s(", n.C)
        for i := range n.FuncType.Params {