From: Dodji Seketeli <dodji@redhat.com>
Date: Thu, 20 Oct 2011 08:49:29 +0000 (+0000)
Subject: Fix thinko in _cpp_remaining_tokens_num_in_context
X-Git-Tag: releases/gcc-4.7.0~2958
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cbbcf6551190acb75bedee26a6fc0c7ad71e01c0;p=thirdparty%2Fgcc.git

Fix thinko in _cpp_remaining_tokens_num_in_context

libcpp/

	* lex.c (_cpp_remaining_tokens_num_in_context): Fix computation of
	number of tokens.

From-SVN: r180239
---

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index bbb4085f012e..128d3e1cec01 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 cd6ae9f67ddd..527368b8607a 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 ();
 }