cmd/cgo: do not output empty struct for -cdefs

R=golang-dev, iant
CC=golang-dev
https://golang.org/cl/9574043

diff --git a/src/cmd/cgo/godefs.go b/src/cmd/cgo/godefs.go
index 20376170dafd975654902f4a632a9e361ac792fc..3dfedcb282fe99c7ebe496244ea29fabf2f8318a 100644 (file)
--- a/src/cmd/cgo/godefs.go
+++ b/src/cmd/cgo/godefs.go
@@ -204,6 +204,11 @@ func (p *Package) cdefs(f *File, srcfile string) string {
                //              byte Z[4];
                //      }
                if strings.HasPrefix(line, "type ") && strings.HasSuffix(line, " struct {") {
+                       if len(lines) > i+1 && lines[i+1] == "}" {
+                               // do not output empty struct
+                               i++
+                               continue
+                       }
                        s := line[len("type ") : len(line)-len(" struct {")]
                        printf("struct %s {\n", s)
                        for i++; i < len(lines) && lines[i] != "}"; i++ {