From: Alex Brainman <alex.brainman@gmail.com>
Date: Sat, 25 May 2013 10:53:55 +0000 (+1000)
Subject: cmd/cgo: do not output empty struct for -cdefs
X-Git-Tag: go1.2rc2~1408
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=a2ec8abd2d1f6b1ac0cdbfc4a66677308f6a5cd9;p=gostls13.git

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 20376170da..3dfedcb282 100644
--- 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++ {