summaryrefslogtreecommitdiff
path: root/src/tools/lcc/cpp/macro.c
diff options
context:
space:
mode:
author/dev/humancontroller <devhc@example.com>2017-04-13 11:30:00 +0000
committer/dev/humancontroller <devhc@example.com>2017-04-15 12:11:01 +0200
commit60d92bbdcfc22c7248989ad7efb856989d299daa (patch)
tree74de9d4cb1f1a938705e13257ba136b9872b6600 /src/tools/lcc/cpp/macro.c
parent1a5afab2fcd1d43e5d43160ee601fa3bfa375a76 (diff)
update the tools to the latest revision
URL: https://github.com/darklegion/tremulous revision: c862a5340c8de44dcc7abaff170c20c04f9340e8, equivalently f45fbef604e05144057dec8d1dbfc5d4f5a2a822
Diffstat (limited to 'src/tools/lcc/cpp/macro.c')
-rw-r--r--src/tools/lcc/cpp/macro.c11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/tools/lcc/cpp/macro.c b/src/tools/lcc/cpp/macro.c
index 49d1129..2972083 100644
--- a/src/tools/lcc/cpp/macro.c
+++ b/src/tools/lcc/cpp/macro.c
@@ -218,7 +218,6 @@ expand(Tokenrow *trp, Nlist *np)
insertrow(trp, ntokc, &ntr);
trp->tp -= rowlen(&ntr);
dofree(ntr.bp);
- return;
}
/*
@@ -471,10 +470,10 @@ builtin(Tokenrow *trp, int biname)
/* most are strings */
tp->type = STRING;
if (tp->wslen) {
- *outp++ = ' ';
+ *outbufp++ = ' ';
tp->wslen = 1;
}
- op = outp;
+ op = outbufp;
*op++ = '"';
switch (biname) {
@@ -509,7 +508,7 @@ builtin(Tokenrow *trp, int biname)
}
if (tp->type==STRING)
*op++ = '"';
- tp->t = (uchar*)outp;
- tp->len = op - outp;
- outp = op;
+ tp->t = (uchar*)outbufp;
+ tp->len = op - outbufp;
+ outbufp = op;
}