diff options
| author | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:25:02 +0000 |
|---|---|---|
| committer | Sander Vesik <svesik@openoffice.org> | 2004-04-21 12:25:02 +0000 |
| commit | c45894186da2af2b7560362886039e3011d023f8 (patch) | |
| tree | a327893500498cfacf10b90aa5c68616149d82b5 /soltools | |
| parent | a0b80dd4ed826f117f29efc05af587a413da8287 (diff) | |
INTEGRATION: CWS ooo20040329 (1.3.48); FILE MERGED
2004/03/17 12:44:06 waratah 1.3.48.1: #i1858# add a couple of brackets to show explicit order in tests
Diffstat (limited to 'soltools')
| -rw-r--r-- | soltools/cpp/_macro.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/soltools/cpp/_macro.c b/soltools/cpp/_macro.c index 1b2f4c4a1742..57a5dd6039a2 100644 --- a/soltools/cpp/_macro.c +++ b/soltools/cpp/_macro.c @@ -1,7 +1,6 @@ #include <stdio.h> #include <stdlib.h> #include <string.h> - #ifdef __hpux # define _HPUX_SOURCE #endif @@ -99,7 +98,7 @@ void { if (comparetokens(def, np->vp) || (np->ap == NULL) != (args == NULL) - || np->ap && comparetokens(args, np->ap)) + || (np->ap && comparetokens(args, np->ap))) { if ( np->loc ) error(ERROR, @@ -479,7 +478,8 @@ int parens--; if (lp->type == DSHARP) lp->type = DSHARP1; /* ## not special in arg */ - if (lp->type == COMMA && parens == 0 || parens < 0 && (lp - 1)->type != LP) + if ((lp->type == COMMA && parens == 0) || + ( parens < 0 && ((lp - 1)->type != LP))) { if (*narg >= NARG - 1) error(FATAL, "Sorry, too many macro arguments"); |