aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cpplib.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eb01f20..aef2b93 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2000-11-04 Neil Booth <neilb@earthling.net>
+
+ * cpplib.c (do_line): Only warn pedantically if not reading
+ preprocessed input.
+
2000-11-04 Alexandre Oliva <aoliva@redhat.com>
* calls.c (emit_call_1) [sibcall_pop]: Use n_popped instead of
diff --git a/gcc/cpplib.c b/gcc/cpplib.c
index 738b1ba..1a9c483 100644
--- a/gcc/cpplib.c
+++ b/gcc/cpplib.c
@@ -743,7 +743,7 @@ do_line (pfile)
if (read_line_number (pfile, &action_number) != 0)
{
- if (CPP_PEDANTIC (pfile))
+ if (! CPP_OPTION (pfile, preprocessed) && CPP_PEDANTIC (pfile))
cpp_pedwarn (pfile, "extra tokens at end of #line directive");
if (action_number == 1)