summaryrefslogtreecommitdiff
path: root/gcc/cpperror.c
diff options
context:
space:
mode:
authorneil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>2002-07-09 22:21:37 +0000
committerneil <neil@138bc75d-0d04-0410-961f-82ee72b054a4>2002-07-09 22:21:37 +0000
commitecedd82dcfc198d99b53f269a1213f8f214115bf (patch)
treee390f035173a9fd06a813df8aaf84b4cafa2f92f /gcc/cpperror.c
parentdca8af3e56a53cdd2c6952d3d86d62b5f615e13e (diff)
downloadgcc-ecedd82dcfc198d99b53f269a1213f8f214115bf.tar.gz
* 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. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@55347 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/cpperror.c')
-rw-r--r--gcc/cpperror.c5
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