summaryrefslogtreecommitdiff
path: root/utils/c2l/cc.y
diff options
context:
space:
mode:
authorforsyth <forsyth@lavoro.terzarima.net>2013-06-03 21:01:14 +0000
committerforsyth <forsyth@lavoro.terzarima.net>2013-06-03 21:01:14 +0000
commit45a20ab721a513710138340faff3d59a31c3e01e (patch)
treeeea29d2684c51cc73725b8992a2125bede48e118 /utils/c2l/cc.y
parentcd8e99851af33e52bcdf8faf34f9d4e62fa0cbaf (diff)
sync compilers with Plan 9
remove 1[acl] 2[acl]
Diffstat (limited to 'utils/c2l/cc.y')
-rw-r--r--utils/c2l/cc.y12
1 files changed, 6 insertions, 6 deletions
diff --git a/utils/c2l/cc.y b/utils/c2l/cc.y
index 22dc6c0c..c66fdb4b 100644
--- a/utils/c2l/cc.y
+++ b/utils/c2l/cc.y
@@ -887,8 +887,8 @@ slstring:
{
$$ = new(OLSTRING, Z, Z);
$$->type = typ(TARRAY, types[TUSHORT]);
- $$->type->width = $1.l + sizeof(ushort);
- $$->rstring = (ushort*)$1.s;
+ $$->type->width = $1.l + sizeof(TRune);
+ $$->rstring = (TRune*)$1.s;
$$->sym = symstring;
}
@@ -902,19 +902,19 @@ lstring:
char *s;
int n1, n2;
- n1 = $1->type->width - sizeof(ushort);
- n2 = $2->type->width - sizeof(ushort);
+ n1 = $1->type->width - sizeof(TRune);
+ n2 = $2->type->width - sizeof(TRune);
s = alloc(n1+n2+MAXALIGN);
memcpy(s, $1->rstring, n1);
memcpy(s+n1, $2->rstring, n2);
- *(ushort*)(s+n1+n2) = 0;
+ *(TRune*)(s+n1+n2) = 0;
$1->left = new(OCAT, ncopy($1), $2);
$$ = $1;
$$->type->width += n2;
- $$->rstring = (ushort*)s;
+ $$->rstring = (TRune*)s;
}
zelist: