mirror of
https://github.com/ioquake/ioq3.git
synced 2024-11-10 07:11:46 +00:00
Renaming outp to outbufp because outp() is an existing function
This commit is contained in:
parent
36f65fd7c5
commit
6de3f51c23
4 changed files with 11 additions and 11 deletions
|
@ -9,7 +9,7 @@ char rcsid[] = "cpp.c - faked rcsid";
|
|||
|
||||
#define OUTS 16384
|
||||
char outbuf[OUTS];
|
||||
char *outp = outbuf;
|
||||
char *outbufp = outbuf;
|
||||
Source *cursource;
|
||||
int nerrs;
|
||||
struct token nltoken = { NL, 0, 0, 0, 1, (uchar*)"\n" };
|
||||
|
@ -51,7 +51,7 @@ process(Tokenrow *trp)
|
|||
for (;;) {
|
||||
if (trp->tp >= trp->lp) {
|
||||
trp->tp = trp->lp = trp->bp;
|
||||
outp = outbuf;
|
||||
outbufp = outbuf;
|
||||
anymacros |= gettokens(trp, 1);
|
||||
trp->tp = trp->bp;
|
||||
}
|
||||
|
|
|
@ -143,7 +143,7 @@ void setobjname(char *);
|
|||
|
||||
char *basepath( char *fname );
|
||||
|
||||
extern char *outp;
|
||||
extern char *outbufp;
|
||||
extern Token nltoken;
|
||||
extern Source *cursource;
|
||||
extern char *curtime;
|
||||
|
|
|
@ -120,7 +120,7 @@ genline(void)
|
|||
static Tokenrow tr = { &ta, &ta, &ta+1, 1 };
|
||||
uchar *p;
|
||||
|
||||
ta.t = p = (uchar*)outp;
|
||||
ta.t = p = (uchar*)outbufp;
|
||||
strcpy((char*)p, "#line ");
|
||||
p += sizeof("#line ")-1;
|
||||
p = (uchar*)outnum((char*)p, cursource->line);
|
||||
|
@ -133,8 +133,8 @@ genline(void)
|
|||
strcpy((char*)p, cursource->filename);
|
||||
p += strlen((char*)p);
|
||||
*p++ = '"'; *p++ = '\n';
|
||||
ta.len = (char*)p-outp;
|
||||
outp = (char*)p;
|
||||
ta.len = (char*)p-outbufp;
|
||||
outbufp = (char*)p;
|
||||
tr.tp = tr.bp;
|
||||
puttokens(&tr);
|
||||
}
|
||||
|
|
|
@ -470,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) {
|
||||
|
||||
|
@ -508,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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue