From 56051c0abd9ba1c659367b4e3530ae073d0bb9ba Mon Sep 17 00:00:00 2001 From: Neil Booth Date: Mon, 6 Nov 2000 18:47:21 +0000 Subject: cpplex.c (_cpp_equiv_tokens): Check arg_no in the CPP_MACRO_ARG case. * cpplex.c (_cpp_equiv_tokens): Check arg_no in the CPP_MACRO_ARG case. From-SVN: r37277 --- gcc/ChangeLog | 5 +++++ gcc/cpplex.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 725d11e..8a2fb0f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,10 @@ 2000-11-06 Neil Booth + * cpplex.c (_cpp_equiv_tokens): Check arg_no in the + CPP_MACRO_ARG case. + +2000-11-06 Neil Booth + * c-lex.c (c_lex): Replace tok.val.aux with tok.val.c or tok.val.arg_no as appropriate. * cppexp.c (lex): Similarly. diff --git a/gcc/cpplex.c b/gcc/cpplex.c index c77ed91..eab49ff 100644 --- a/gcc/cpplex.c +++ b/gcc/cpplex.c @@ -1433,7 +1433,7 @@ _cpp_equiv_tokens (a, b) case SPELL_CHAR: return a->val.c == b->val.c; /* Character. */ case SPELL_NONE: - return (a->type != CPP_MACRO_ARG || a->val.c == b->val.c); + return (a->type != CPP_MACRO_ARG || a->val.arg_no == b->val.arg_no); case SPELL_IDENT: return a->val.node == b->val.node; case SPELL_STRING: -- cgit v1.1