diff options
| author | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-04 15:33:23 +0000 |
|---|---|---|
| committer | jakub <jakub@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-03-04 15:33:23 +0000 |
| commit | 960391dac29879ff562fd39b309effd1e9324226 (patch) | |
| tree | 421272499f1b4f88b03e1b37bb0db355e0350e71 /libcpp | |
| parent | 9e959634efbd40dadab240f0f730661e9e4fe68e (diff) | |
| download | gcc-960391dac29879ff562fd39b309effd1e9324226.tar.gz | |
PR bootstrap/20282
PR bootstrap/20305
* macro.c (replace_args, cpp_get_token): Copy whole
cpp_token_u instead of just cpp_string field from it.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@95887 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcpp')
| -rw-r--r-- | libcpp/ChangeLog | 7 | ||||
| -rw-r--r-- | libcpp/macro.c | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 1f441b19b9d..b246de782da 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,10 @@ +2005-03-04 Jakub Jelinek <jakub@redhat.com> + + PR bootstrap/20282 + PR bootstrap/20305 + * macro.c (replace_args, cpp_get_token): Copy whole + cpp_token_u instead of just cpp_string field from it. + 2005-02-28 Devang Patel <dpatel@apple.com> * directives.c (do_line): Save sysp early before line table is diff --git a/libcpp/macro.c b/libcpp/macro.c index 5e596699e01..7d65886a390 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -886,7 +886,7 @@ replace_args (cpp_reader *pfile, cpp_hashnode *node, cpp_macro *macro, macro_arg { cpp_token *token = _cpp_temp_token (pfile); token->type = (*paste_flag)->type; - token->val.str = (*paste_flag)->val.str; + token->val = (*paste_flag)->val; if (src->flags & PASTE_LEFT) token->flags = (*paste_flag)->flags | PASTE_LEFT; else @@ -1120,7 +1120,7 @@ cpp_get_token (cpp_reader *pfile) cpp_token *t = _cpp_temp_token (pfile); t->type = result->type; t->flags = result->flags | NO_EXPAND; - t->val.str = result->val.str; + t->val = result->val; result = t; } |