cppmacro.c (cpp_scan_buffer_nooutput): Take a boolean indicating whether to scan...

        * cppmacro.c (cpp_scan_buffer_nooutput): Take a boolean
        indicating whether to scan all buffers on the stack or
        just one.
        * cppinit.c (do_includes): Update.
        * cppmain.c (main): Update.
        * cpplib.h: Update prototype.

From-SVN: r37829

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 18b1d1519e5d6cfe40a2a46b13e7d556931b3148..4855894581a20d0f97ecc018870a43889108cac1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2000-11-28  Neil Booth  <neilb@earthling.net>
+
+        * cppmacro.c (cpp_scan_buffer_nooutput): Take a boolean
+        indicating whether to scan all buffers on the stack or
+        just one.
+        * cppinit.c (do_includes): Update.
+        * cppmain.c (main): Update.
+        * cpplib.h: Update prototype.
+
 2000-11-28  Richard Henderson  <rth@redhat.com>
 
        * genoutput.c (validate_insn_operands): New.

diff --git a/gcc/cppinit.c b/gcc/cppinit.c
index 39e1562c93671a4515ddb991e554ef12d5dece62..a91a6d104148fb7c5633aaa54415aacfd78725ef 100644 (file)
--- a/gcc/cppinit.c
+++ b/gcc/cppinit.c
@@ -931,7 +931,7 @@ do_includes (pfile, p, scan)
       /* Later: maybe update this to use the #include "" search path
         if cpp_read_file fails.  */
       if (cpp_read_file (pfile, p->arg) && scan)
-       cpp_scan_buffer_nooutput (pfile);
+       cpp_scan_buffer_nooutput (pfile, 0);
       q = p->next;
       free (p);
       p = q;

diff --git a/gcc/cpplib.h b/gcc/cpplib.h
index 3732556e3f3f12101152d79eeb2001d6ef7bb0a8..9f2961ab07be38ac0604992ff5b3b6b1fa380454 100644 (file)
--- a/gcc/cpplib.h
+++ b/gcc/cpplib.h
@@ -777,7 +777,7 @@ extern void cpp_forall_identifiers  PARAMS ((cpp_reader *,
                                                 void *));
 
 /* In cppmacro.c */
-extern void cpp_scan_buffer_nooutput   PARAMS ((cpp_reader *));
+extern void cpp_scan_buffer_nooutput   PARAMS ((cpp_reader *, int));
 extern void cpp_start_lookahead                PARAMS ((cpp_reader *));
 extern void cpp_stop_lookahead         PARAMS ((cpp_reader *, int));
 

diff --git a/gcc/cppmacro.c b/gcc/cppmacro.c
index f9291bcdc40d6759a678a78827f68e1153ced7a1..637e5e9553697d1adb8b72b33f282c23eafb2f54 100644 (file)
--- a/gcc/cppmacro.c
+++ b/gcc/cppmacro.c
@@ -990,11 +990,12 @@ cpp_get_token (pfile, token)
 /* Read each token in, until EOF.  Directives are transparently
    processed.  */
 void
-cpp_scan_buffer_nooutput (pfile)
+cpp_scan_buffer_nooutput (pfile, all_buffers)
      cpp_reader *pfile;
+     int all_buffers;
 {
-  cpp_buffer *buffer = pfile->buffer->prev;
   cpp_token token;
+  cpp_buffer *buffer = all_buffers ? 0: pfile->buffer->prev;
 
   do
     do

diff --git a/gcc/cppmain.c b/gcc/cppmain.c
index 8b15f65d0b390a500d1993c5d1ebf0119e1733ae..cc958e0040382494538c02b9e43c6e149ec3a4f9 100644 (file)
--- a/gcc/cppmain.c
+++ b/gcc/cppmain.c
@@ -95,7 +95,7 @@ main (argc, argv)
   if (CPP_BUFFER (pfile))
     {
       if (CPP_OPTION (pfile, no_output))
-       cpp_scan_buffer_nooutput (pfile);
+       cpp_scan_buffer_nooutput (pfile, 1);
       else
        scan_buffer (pfile);
     }