diff options
| -rw-r--r-- | libcpp/ChangeLog | 6 | ||||
| -rw-r--r-- | libcpp/lex.c | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index bbb4085..128d3e1 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,9 @@ +2011-10-20 Dodji Seketeli <dodji@redhat.com> + + PR bootstrap/50801 + * lex.c (_cpp_remaining_tokens_num_in_context): Fix computation of + number of tokens. + 2011-10-18 Dodji Seketeli <dodji@redhat.com> PR bootstrap/50760 diff --git a/libcpp/lex.c b/libcpp/lex.c index cd6ae9f..527368b 100644 --- a/libcpp/lex.c +++ b/libcpp/lex.c @@ -1710,12 +1710,10 @@ _cpp_remaining_tokens_num_in_context (cpp_reader *pfile) { cpp_context *context = pfile->context; if (context->tokens_kind == TOKENS_KIND_DIRECT) - return ((LAST (context).token - FIRST (context).token) - / sizeof (cpp_token)); + return (LAST (context).token - FIRST (context).token); else if (context->tokens_kind == TOKENS_KIND_INDIRECT || context->tokens_kind == TOKENS_KIND_EXTENDED) - return ((LAST (context).ptoken - FIRST (context).ptoken) - / sizeof (cpp_token *)); + return (LAST (context).ptoken - FIRST (context).ptoken); else abort (); } |