* cppfiles.c (cpp_make_system_header): Take 2 booleans,

        and operate on current buffer.
        (cpp_read_file): Rename _cpp_read_file.
        * cpplib.c (do_line, do_pragma_system_header): Update calls to
        cpp_make_system_header.
        * fix-header.c: Similarly.
        * cpphash.h (_cpp_read_file): Move from...
        * cpplib.h: ... here.
        * cppinit.c (do_includes, cpp_start_read): Update appropriately.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@37989 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 9 insertions, 10 deletions

diff --git a/gcc/cppfiles.c b/gcc/cppfiles.c
index 9af0c396cd7..4043a57c2b9 100644
--- a/gcc/cppfiles.c
+++ b/gcc/cppfiles.c
@@ -526,17 +526,16 @@ _cpp_fake_include (pfile, fname)
    see the details of struct include_file.  This is an exported interface
    because fix-header needs it.  */
 void
-cpp_make_system_header (pfile, pbuf, flag)
+cpp_make_system_header (pfile, syshdr, externc)
      cpp_reader *pfile;
-     cpp_buffer *pbuf;
-     int flag;
+     int syshdr, externc;
 {
-  if (flag < 0 || flag > 2)
-    cpp_ice (pfile, "cpp_make_system_header: bad flag %d\n", flag);
-  else if (!pbuf->inc)
-    cpp_ice (pfile, "cpp_make_system_header called on non-file buffer");
-  else
-    pbuf->inc->sysp = flag;
+  int flags = 0;
+
+  /* 1 = system header, 2 = system header to be treated as C.  */
+  if (syshdr)
+    flags = 1 + (externc != 0);
+  pfile->buffer->inc->sysp = flags;
 }
 
 /* Report on all files that might benefit from a multiple include guard.
@@ -714,7 +713,7 @@ _cpp_compare_file_date (pfile, f)
 /* Push an input buffer and load it up with the contents of FNAME.
    If FNAME is "" or NULL, read standard input.  */
 int
-cpp_read_file (pfile, fname)
+_cpp_read_file (pfile, fname)
      cpp_reader *pfile;
      const char *fname;
 {