diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:05:46 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-06-20 04:05:46 +0000 |
| commit | 26621004a468c08dea384e44cb225307c635bde1 (patch) | |
| tree | 5bdfa52fc0294bccfdb03ca42a3cae3017b796c6 /soltools | |
| parent | bd6da379e5ac592916ea91433eeeb748bb625ddb (diff) | |
INTEGRATION: CWS warnings01 (1.4.42); FILE MERGED
2005/11/07 12:08:30 sb 1.4.42.3: #i53898# Made code warning-free (additional -W switches for GCC).
2005/09/02 14:57:33 sb 1.4.42.2: #i53898# Made code warning-free.
2005/08/29 13:36:15 sb 1.4.42.1: #i53898# Made code warning-free.
Diffstat (limited to 'soltools')
| -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 be0d5be0273b..be15eb0a13c0 100644 --- a/soltools/cpp/_cpp.c +++ b/soltools/cpp/_cpp.c @@ -10,14 +10,14 @@ char outbuf[OUTS]; char *outptr = outbuf; Source *cursource; int nerrs; -struct token nltoken = {NL, 0, 0, 1, (uchar *) "\n"}; +struct token nltoken = {NL, 0, 0, 1, (uchar *) "\n", 0}; char *curtime; int incdepth; int ifdepth; int ifsatisfied[NIF]; int skipping; -char rcsid[] = "$Version 1.2 $ $Revision: 1.4 $ $Date: 2004-04-21 13:24:16 $"; +char rcsid[] = "$Version 1.2 $ $Revision: 1.5 $ $Date: 2006-06-20 05:05:46 $"; int #ifdef _WIN32 @@ -45,7 +45,6 @@ __cdecl flushout(); fflush(stderr); exit(nerrs > 0); - return 0; } void @@ -255,7 +254,8 @@ void tp = trp->bp + 2; kline: if (tp + 1 >= trp->lp || tp->type != NUMBER || tp + 3 < trp->lp - || (tp + 3 == trp->lp && ((tp + 1)->type != STRING) || *(tp + 1)->t == 'L')) + || (tp + 3 == trp->lp + && ((tp + 1)->type != STRING || *(tp + 1)->t == 'L'))) { error(ERROR, "Syntax error in #line"); return; |