From: Russ Cox <rsc@golang.org>
Date: Wed, 30 Jan 2013 17:10:06 +0000 (-0800)
Subject: cmd/5l: reestablish uniform union field naming
X-Git-Tag: go1.1rc2~1243
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=e6861d8c34002b7f1b8a12b03672fda02f02d7ed;p=gostls13.git

cmd/5l: reestablish uniform union field naming

R=golang-dev, minux.ma
CC=golang-dev
https://golang.org/cl/7226063
---

diff --git a/src/cmd/5l/l.h b/src/cmd/5l/l.h
index abfd7e12ab..0a04559e9a 100644
--- a/src/cmd/5l/l.h
+++ b/src/cmd/5l/l.h
@@ -69,8 +69,8 @@ struct	Adr
 	union
 	{
 		struct {
-			int32	offset;
-			int32	offset2; // argsize
+			int32	u0offset;
+			int32	u0offset2; // argsize
 		} u0off;
 		char*	u0sval;
 		Ieee	u0ieee;
@@ -84,8 +84,8 @@ struct	Adr
 	char	class;
 };
 
-#define	offset	u0.u0off.offset
-#define	offset2	u0.u0off.offset2
+#define	offset	u0.u0off.u0offset
+#define	offset2	u0.u0off.u0offset2
 #define	sval	u0.u0sval
 #define	scon	sval
 #define	ieee	u0.u0ieee