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

gcc/ChangeLog

+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

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;

gcc/testsuite/gcc.dg/cpp-redef-2.c

 /* 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)