diff options
| author | Zack Weinberg <zack@wolery.cumb.org> | 2000-03-09 17:49:26 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2000-03-09 17:49:26 +0000 |
| commit | 8051b17802cf05b70177ae9a370940ba677f1add (patch) | |
| tree | edbb4bc15e1240f47d8004e4a9bdcb43c90f0acf | |
| parent | 37c5269a9f449dcba7506876258aa75548c5766b (diff) | |
| download | gcc-8051b17802cf05b70177ae9a370940ba677f1add.tar.gz | |
cpphash.c (collect_formal_parameters): strncmp returns 0 for match.
* cpphash.c (collect_formal_parameters): strncmp returns 0 for
match. (cpp_compare_defs): Count the nul separator when
advancing over argument names.
From-SVN: r32448
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cpphash.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/gcc.dg/cpp-redef-2.c | 2 |
3 files changed, 9 insertions, 3 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 824e4d4baa6..a362174c9e0 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2000-03-09 Zack Weinberg <zack@wolery.cumb.org> + + * cpphash.c (collect_formal_parameters): strncmp returns 0 for + match. (cpp_compare_defs): Count the nul separator when + advancing over argument names. + 2000-03-09 Bernd Schmidt <bernds@cygnus.co.uk> * recog.c (preprocess_constraints): Matching constraints affect diff --git a/gcc/cpphash.c b/gcc/cpphash.c index fc4051b8d4c..51c5de01c99 100644 --- a/gcc/cpphash.c +++ b/gcc/cpphash.c @@ -588,7 +588,7 @@ collect_formal_parameters (pfile) continue; } if (CPP_PEDANTIC (pfile) && CPP_OPTIONS (pfile)->c99 - && strncmp (tok, "__VA_ARGS__", sizeof "__VA_ARGS__" - 1)) + && !strncmp (tok, "__VA_ARGS__", sizeof "__VA_ARGS__" - 1)) cpp_pedwarn (pfile, "C99 does not permit use of `__VA_ARGS__' as a macro argument name"); namebuf = xrealloc (namebuf, argslen + len + 1); @@ -1495,7 +1495,7 @@ _cpp_compare_defs (pfile, d1, d2) int i = d1->nargs; while (i--) { - len = strlen (arg1); + len = strlen (arg1) + 1; if (strcmp (arg1, arg2)) return 1; arg1 += len; diff --git a/gcc/testsuite/gcc.dg/cpp-redef-2.c b/gcc/testsuite/gcc.dg/cpp-redef-2.c index 8d34ddfa05d..d57f26acf41 100644 --- a/gcc/testsuite/gcc.dg/cpp-redef-2.c +++ b/gcc/testsuite/gcc.dg/cpp-redef-2.c @@ -1,7 +1,7 @@ /* Test for redefining macros with significant differences. */ /* { dg-do preprocess } - { dg-options "-pedantic -Wall" } */ + { dg-options "-ansi -pedantic -Wall" } */ #define mac(a, b) (a) + (b) #define mac(a, b) (a) * (b) |