From: Luuk van Dijk <lvd@golang.org>
Date: Tue, 25 Jan 2011 18:40:36 +0000 (+0100)
Subject: cc: fix -q and build break.
X-Git-Tag: weekly.2011-02-01~84
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=66905bd9ac26eeb26f358f6545a5cc06bc06c332;p=gostls13.git

cc: fix -q and build break.

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

diff --git a/src/cmd/cc/godefs.c b/src/cmd/cc/godefs.c
index 2b3e36da31..70a546f783 100644
--- a/src/cmd/cc/godefs.c
+++ b/src/cmd/cc/godefs.c
@@ -209,11 +209,11 @@ printtypename(Type *t)
 		else if(t->tag)
 			n = t->tag->name;
 		if(strcmp(n, "String") == 0){
-			n = "string";
+			Bprint(&outbuf, "string");
 		} else if(strcmp(n, "Slice") == 0){
-			n = "[]byte";
-		}
-		Bprint(&outbuf, n);
+			Bprint(&outbuf, "[]byte");
+		} else
+			Bprint(&outbuf, "%U", n);
 		break;
 	case TFUNC:
 		Bprint(&outbuf, "func(", t);
@@ -330,7 +330,7 @@ godefvar(Sym *s)
 	Type *t, *t1;
 	char n;
 
-	if(dontrun('q'))
+	if(dontrun())
 		return;
 
 	t = s->type;