diff options
| author | Neil Booth <neil@daikokuya.co.uk> | 2002-07-09 22:21:37 +0000 |
|---|---|---|
| committer | Neil Booth <neil@gcc.gnu.org> | 2002-07-09 22:21:37 +0000 |
| commit | cd98faa13814ce3712fc1c1be9690180d89810e5 (patch) | |
| tree | e390f035173a9fd06a813df8aaf84b4cafa2f92f /gcc/cpperror.c | |
| parent | 2ad65b0e91312a9f2fadd4abd9eb9d98b085920c (diff) | |
| download | gcc-cd98faa13814ce3712fc1c1be9690180d89810e5.tar.gz | |
cpperror.c (cpp_error): Default to directive_line within directives here.
* cpperror.c (cpp_error): Default to directive_line within
directives here.
* cppexp.c (cpp_interpret_integer): Only use traditional
number semantics in directives.
* cpplib.c (prepare_directive_trad): Don't reset pfile->line.
(do_include_common): Similarly.
* cpptrad.c (scan_out_logical_line): Implement accurate
quoting of <> in #include.
* doc/cpp.texi: Update.
From-SVN: r55347
Diffstat (limited to 'gcc/cpperror.c')
| -rw-r--r-- | gcc/cpperror.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cpperror.c b/gcc/cpperror.c index 0e3b0b631f0..360bc8ccef3 100644 --- a/gcc/cpperror.c +++ b/gcc/cpperror.c @@ -139,7 +139,10 @@ cpp_error VPARAMS ((cpp_reader * pfile, int level, const char *msgid, ...)) { if (CPP_OPTION (pfile, traditional)) { - line = pfile->line; + if (pfile->state.in_directive) + line = pfile->directive_line; + else + line = pfile->line; column = 0; } else |