diff options
| author | Per Bothner <pbothner@apple.com> | 2003-08-26 22:53:22 +0000 |
|---|---|---|
| committer | Per Bothner <bothner@gcc.gnu.org> | 2003-08-26 15:53:22 -0700 |
| commit | dc3786d833bc642b1d7e481eb947c1247eebf6d9 (patch) | |
| tree | 4ae24f4c9ddb5a1cde65438aa13e8e99b3a74c7e /gcc/cpphash.h | |
| parent | a85993787b6d4270ae5447eed498168a1c37642b (diff) | |
| download | gcc-dc3786d833bc642b1d7e481eb947c1247eebf6d9.zip gcc-dc3786d833bc642b1d7e481eb947c1247eebf6d9.tar.gz gcc-dc3786d833bc642b1d7e481eb947c1247eebf6d9.tar.bz2 | |
Copy over from cs branch:
* cpplib.h (struct cpp_token): Change type of field line to fileline.
(cpp_error_with_line): Use fileline for appropriate parameter.
* cpphash.h (struct cpp_macro): Change type of field line to fileline.
(struct cpp_reader): Likewise for fields line and directive_line.
(_cpp_begin_message): Use fileline for appropriate parameter.
* cpperror.c (print_location, _cpp_begin_message, cpp_error_with_line,
cpp_error): Use fileline for appropriate parameters and variables.
(print_location): New local lin, since it is not a fileline.
From-SVN: r70826
Diffstat (limited to 'gcc/cpphash.h')
| -rw-r--r-- | gcc/cpphash.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/cpphash.h b/gcc/cpphash.h index 8b8f3d8..e6eadce 100644 --- a/gcc/cpphash.h +++ b/gcc/cpphash.h @@ -100,7 +100,7 @@ struct cpp_macro } exp; /* Definition line number. */ - unsigned int line; + fileline line; /* Number of tokens in expansion, or bytes for traditional macros. */ unsigned int count; @@ -337,10 +337,10 @@ struct cpp_reader /* Source line tracking. */ struct line_maps line_maps; const struct line_map *map; - unsigned int line; + fileline line; /* The line of the '#' of the current directive. */ - unsigned int directive_line; + fileline directive_line; /* Memory buffers. */ _cpp_buff *a_buff; /* Aligned permanent storage. */ @@ -497,7 +497,7 @@ extern unsigned char _cpp_trigraph_map[UCHAR_MAX + 1]; #define CPP_WTRADITIONAL(PF) CPP_OPTION (PF, warn_traditional) /* In cpperror.c */ -extern int _cpp_begin_message (cpp_reader *, int, unsigned int, unsigned int); +extern int _cpp_begin_message (cpp_reader *, int, fileline, unsigned int); /* In cppmacro.c */ extern void _cpp_free_definition (cpp_hashnode *); |