diff options
| author | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-12-16 18:23:00 +0000 |
|---|---|---|
| committer | zack <zack@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-12-16 18:23:00 +0000 |
| commit | 805e22b2051e9c6a75377ea6599654d7415da483 (patch) | |
| tree | c259697c448b0c6f548f153c48c46a8d7a75970f /gcc/cpptrad.c | |
| parent | 2c27ce73ee2229b0871c4ccad2342d8a4be85eff (diff) | |
| download | gcc-805e22b2051e9c6a75377ea6599654d7415da483.tar.gz | |
Merge basic-improvements-branch to trunk
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@60174 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cpptrad.c')
| -rw-r--r-- | gcc/cpptrad.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gcc/cpptrad.c b/gcc/cpptrad.c index 902ae493b6a..92c4ee3d522 100644 --- a/gcc/cpptrad.c +++ b/gcc/cpptrad.c @@ -18,6 +18,8 @@ Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "cpplib.h" #include "cpphash.h" @@ -597,12 +599,12 @@ scan_out_logical_line (pfile, macro) goto new_context; } } - else if (macro && node->arg_index) + else if (macro && (node->flags & NODE_MACRO_ARG) != 0) { /* Found a parameter in the replacement text of a #define. Remove its name from the output. */ pfile->out.cur = out_start; - save_replacement_text (pfile, macro, node->arg_index); + save_replacement_text (pfile, macro, node->value.arg_index); out = pfile->out.base; } else if (lex_state == ls_hash) @@ -714,7 +716,7 @@ scan_out_logical_line (pfile, macro) else if (is_idstart (*cur)) /* Check whether we know this directive, but don't advance. */ - do_it = lex_identifier (pfile, cur)->directive_index != 0; + do_it = lex_identifier (pfile, cur)->is_directive; if (do_it || CPP_OPTION (pfile, lang) != CLK_ASM) { |