From 06006eb6930de74c577c87daf6a0f7917e22d578 Mon Sep 17 00:00:00 2001 From: Tim Angus Date: Sat, 23 Apr 2011 22:38:25 +0000 Subject: * Merge ioq3-r1946 --- src/tools/lcc/cpp/tokens.c | 2 +- src/tools/lcc/doc/4.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/tools/lcc') 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 (tpbp || 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; tplp && tpbp+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.

The front end composes conversions between types T1 and T2 -by widening T1 to it's "supertype", if necessary, converting +by widening T1 to its "supertype", if necessary, converting that result to T2's supertype, then narrowing the result to T2, if necessary. The following table lists the supertypes; omitted entries are their own supertypes.

-- cgit