From 3a2b2c7a2062986f770f9860da7499850a5539cf Mon Sep 17 00:00:00 2001 From: Zack Weinberg Date: Tue, 11 Apr 2000 08:29:34 +0000 Subject: cppexp.c, [...]: Replace cpp_token with cpp_ttype everywhere. * 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. From-SVN: r33076 --- gcc/scan-decls.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gcc/scan-decls.c') diff --git a/gcc/scan-decls.c b/gcc/scan-decls.c index 0c10f94..a0b8de0 100644 --- a/gcc/scan-decls.c +++ b/gcc/scan-decls.c @@ -45,7 +45,7 @@ skip_to_closing_brace (pfile) int nesting = 1; for (;;) { - enum cpp_token token = cpp_get_token (pfile); + enum cpp_ttype token = cpp_get_token (pfile); if (token == CPP_EOF) break; if (token == CPP_LBRACE) @@ -90,7 +90,7 @@ scan_decls (pfile, argc, argv) decl-specs, or prev_id_start marks the start of the declarator. */ int declarator_start; int prev_id_start, prev_id_end = 0; - enum cpp_token token; + enum cpp_ttype token; new_statement: CPP_SET_WRITTEN (pfile, 0); @@ -135,8 +135,7 @@ scan_decls (pfile, argc, argv) int nesting = 1; int have_arg_list = 0; cpp_buffer *fbuf = cpp_file_buffer (pfile); - long func_lineno; - cpp_buf_line_and_col (fbuf, &func_lineno, NULL); + unsigned int func_lineno = CPP_BUF_LINE (fbuf); for (;;) { token = cpp_get_token (pfile); -- cgit v1.1