* cppexp.c (parse_defined): Call cpp_get_token not

	_cpp_get_token.
	(lex): Similarly.
	* cpplex.c (cpp_output_line): Similarly.
	* cpplib.c (glue_header_name, do_line, do_ident,
	parse_answer, parse_assertion): Similarly.
	(_cpp_handle_diretive): Don't save to lookaheads
	when processing directives.
	* cppmacro.c (parse_arg, expand_arg): Call cpp_get_token not
	_cpp_get_token.
	(funlike_invocation_p): Don't save to lookaheads
	when pre-expanding arguments.
	(_cpp_get_token): Delete.
	(cpp_get_token): Merge contents of _cpp_get_token.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37462 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 5 insertions, 4 deletions

diff --git a/gcc/cppexp.c b/gcc/cppexp.c
index 82f8aab580f..98bd94e2029 100644
--- a/gcc/cppexp.c
+++ b/gcc/cppexp.c
@@ -321,11 +321,11 @@ parse_defined (pfile)
   /* Don't expand macros.  */
   pfile->state.prevent_expansion++;
 
-  _cpp_get_token (pfile, &token);
+  cpp_get_token (pfile, &token);
   if (token.type == CPP_OPEN_PAREN)
     {
       paren = 1;
-      _cpp_get_token (pfile, &token);
+      cpp_get_token (pfile, &token);
     }
 
   if (token.type == CPP_NAME)
@@ -333,7 +333,7 @@ parse_defined (pfile)
       node = token.val.node;
       if (paren)
 	{
-	  _cpp_get_token (pfile, &token);
+	  cpp_get_token (pfile, &token);
 	  if (token.type != CPP_CLOSE_PAREN)
 	    {
 	      cpp_error (pfile, "missing ')' after \"defined\"");
@@ -378,13 +378,14 @@ lex (pfile, skip_evaluation, token)
 {
   struct op op;
 
-  _cpp_get_token (pfile, token);
+  cpp_get_token (pfile, token);
 
   switch (token->type)
     {
     case CPP_INT:
     case CPP_NUMBER:
       return parse_number (pfile, token);
+
     case CPP_CHAR:
     case CPP_WCHAR:
       return parse_charconst (pfile, token);