cpplib.c (do_line): Only warn pedantically if not reading preprocessed input.

	* cpplib.c (do_line): Only warn pedantically if not reading
        preprocessed input.

From-SVN: r37249

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eb01f208f464039ee970bed58d43ed4eab7788ee..aef2b9372dca4ea7f3ec6107df3732b199e3cc2b 100644 (file)
--- 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 738b1ba2d3bdec5ddb350126bae9044ef2163396..1a9c483bb1e47c3359b4530eb6df6a9ca4f664ad 100644 (file)
--- 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)