diff options
| author | Tim Angus <tim@ngus.net> | 2011-04-23 22:38:25 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:18:07 +0000 |
| commit | 06006eb6930de74c577c87daf6a0f7917e22d578 (patch) | |
| tree | 8caec25df040a3f3eddc99b593e51d993b9be1be /src/tools | |
| parent | 98438cc3e7d32312bb52b413c12698b67b8cfeb0 (diff) | |
* Merge ioq3-r1946
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/lcc/cpp/tokens.c | 2 | ||||
| -rw-r--r-- | src/tools/lcc/doc/4.html | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/tools/lcc/cpp/tokens.c b/src/tools/lcc/cpp/tokens.c index 90ea47f2..ad9f2f7c 100644 --- a/src/tools/lcc/cpp/tokens.c +++ b/src/tools/lcc/cpp/tokens.c @@ -267,7 +267,7 @@ peektokens(Tokenrow *trp, char *str) if (str) fprintf(stderr, "%s ", str); if (tp<trp->bp || tp>trp->lp) - fprintf(stderr, "(tp offset %d) ", tp-trp->bp); + fprintf(stderr, "(tp offset %ld) ", (long int) (tp - trp->bp)); for (tp=trp->bp; tp<trp->lp && tp<trp->bp+32; tp++) { if (tp->type!=NL) { int c = tp->t[tp->len]; diff --git a/src/tools/lcc/doc/4.html b/src/tools/lcc/doc/4.html index a2e1213f..c36f280b 100644 --- a/src/tools/lcc/doc/4.html +++ b/src/tools/lcc/doc/4.html @@ -523,7 +523,7 @@ signed integer. Conversions that widen unsigned integers zero-extend; those that signed integers sign-extend.</p> <p>The front end composes conversions between types <em>T</em><sub>1</sub> and <em>T</em><sub>2</sub> -by widening <em>T</em><sub>1</sub> to it's "supertype", if necessary, converting +by widening <em>T</em><sub>1</sub> to its "supertype", if necessary, converting that result to <em>T</em><sub>2</sub>'s supertype, then narrowing the result to <em>T</em><sub>2</sub>, if necessary. The following table lists the supertypes; omitted entries are their own supertypes.</p> |