* cppexp.c, cpphash.c, cpphash.h, cpplex.c, cpplib.c,

	cpplib.h, cppmain.c, fix-header.c, scan-decls.c: Replace
	cpp_token with cpp_ttype everywhere.
	* cpperror.c, cpphash.c, cpplex.c, cpplib.c, scan-decls.c:
	Replace cpp_buf_line_and_col with CPP_BUF_LINE and/or
	CPP_BUF_COL.  Line and column numbers are unsigned int, not
	long.
	* cpplex.c (cpp_buf_line_and_col): Delete.
	* cpplib.h (struct cpp_buffer, struct cpp_reader): Change
	'long lineno' to 'unsigned int lineno'.
	(CPP_BUF_LINE, CPP_BUF_COL): New macros.


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

1 files changed, 2 insertions, 2 deletions

diff --git a/gcc/cppexp.c b/gcc/cppexp.c
index 31790999eef..46757c581e9 100644
--- a/gcc/cppexp.c
+++ b/gcc/cppexp.c
@@ -343,7 +343,7 @@ parse_defined (pfile)
 {
   int paren = 0, len;
   U_CHAR *tok;
-  enum cpp_token token;
+  enum cpp_ttype token;
   struct operation op;
   long old_written = CPP_WRITTEN (pfile);
 
@@ -413,7 +413,7 @@ lex (pfile, skip_evaluation)
      int skip_evaluation;
 {
   const struct token *toktab;
-  enum cpp_token token;
+  enum cpp_ttype token;
   struct operation op;
   U_CHAR *tok_start, *tok_end;
   long old_written;