aboutsummaryrefslogtreecommitdiff
path: root/src/cmd/acid/builtin.c
diff options
context:
space:
mode:
authorRuss Cox <rsc@swtch.com>2012-03-05 16:36:31 -0500
committerRuss Cox <rsc@swtch.com>2012-03-05 16:36:31 -0500
commit4a000a28d30ea9a7df06088bcd4bed0ab431f0ad (patch)
treeeb01eecada873fb4b301902ef59516054af8f23a /src/cmd/acid/builtin.c
parenta31903778164deec9e58a525e2203bb416cafe0e (diff)
parenta31903778164deec9e58a525e2203bb416cafe0e (diff)
downloadplan9port-4a000a28d30ea9a7df06088bcd4bed0ab431f0ad.tar.gz
plan9port-4a000a28d30ea9a7df06088bcd4bed0ab431f0ad.tar.bz2
plan9port-4a000a28d30ea9a7df06088bcd4bed0ab431f0ad.zip
merge
Diffstat (limited to 'src/cmd/acid/builtin.c')
-rw-r--r--src/cmd/acid/builtin.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/acid/builtin.c b/src/cmd/acid/builtin.c
index 1b09a4ef..ddc326a4 100644
--- a/src/cmd/acid/builtin.c
+++ b/src/cmd/acid/builtin.c
@@ -866,7 +866,7 @@ cvtatoi(Node *r, Node *args)
r->op = OCONST;
r->type = TINT;
- r->store.u.ival = strtoul(res.store.u.string->string, 0, 0);
+ r->store.u.ival = strtoull(res.store.u.string->string, 0, 0);
r->store.fmt = 'D';
}
@@ -875,7 +875,7 @@ cvtitoa(Node *r, Node *args)
{
Node res;
Node *av[Maxarg];
- int ival;
+ s64int ival;
char buf[128], *fmt;
if(args == 0)
@@ -1030,7 +1030,7 @@ flatten(Node **av, Node *n)
static struct
{
char *name;
- ulong val;
+ u64int val;
} sregs[Maxarg/2];
static int nsregs;