diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:24:16 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:24:16 +0000 |
| commit | a3981e9263aabc9a58ead03f4d708d146390727b (patch) | |
| tree | 6731428b5338d6ed979e46287d20b34bd560aa8f /soltools/cpp/_cpp.c | |
| parent | 830d8497d5e0c8532b8da0e7e24fa826e628d62c (diff) | |
INTEGRATION: CWS ooo20040329 (1.3.48); FILE MERGED
2004/03/17 12:43:16 waratah 1.3.48.1: #i1858# add a couple of brackets to show explicit or on if tests
out a cast in to make sure of type for display in printf
Diffstat (limited to 'soltools/cpp/_cpp.c')
| -rw-r--r-- | soltools/cpp/_cpp.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/soltools/cpp/_cpp.c b/soltools/cpp/_cpp.c index 1f69d399dc6e..be0d5be0273b 100644 --- a/soltools/cpp/_cpp.c +++ b/soltools/cpp/_cpp.c @@ -17,7 +17,7 @@ int ifdepth; int ifsatisfied[NIF]; int skipping; -char rcsid[] = "$Version 1.2 $ $Revision: 1.3 $ $Date: 2003-03-18 12:47:33 $"; +char rcsid[] = "$Version 1.2 $ $Revision: 1.4 $ $Date: 2004-04-21 13:24:16 $"; int #ifdef _WIN32 @@ -116,7 +116,7 @@ void error(ERROR, "Unidentifiable control line"); return; /* else empty line */ } - if ((np = lookup(tp, 0)) == NULL || (np->flag & ISKW) == 0 && !skipping) + if ((np = lookup(tp, 0)) == NULL || ((np->flag & ISKW) == 0 && !skipping)) { error(WARNING, "Unknown preprocessor control %t", tp); return; @@ -354,7 +354,7 @@ void case 't': tp = va_arg(ap, Token *); - fprintf(stderr, "%.*s", tp->len, tp->t); + fprintf(stderr, "%.*s", (int)tp->len, tp->t); break; case 'r': @@ -363,7 +363,7 @@ void { if (tp > trp->tp && tp->wslen) fputc(' ', stderr); - fprintf(stderr, "%.*s", tp->len, tp->t); + fprintf(stderr, "%.*s", (int)tp->len, tp->t); } break; |