* c-common.c (STDC_0_IN_SYSTEM_HEADERS, c_common_init): Move

	to c-copts.c.
	(warn_multichar): Die.
	(cb_register_builtins): Export.
	* c-common.h (warn_multichar, preprocess_file): Remove.
	(cb_register_builtins): New.
	* c-lang.c (c_init): Remove.
	(LANG_HOOKS_INIT): Use c_objc_common_init.
	* c-lex.c (init_c_lex): Don't canonicalize filename.
	* c-opts.c (in_fname, STDC_0_IN_SYSTEM_HEADERS): New.
	(preprocess_file): Make static.  Update for cpplib.
	(c_common_decode_option): Remove warn_multichar.  Use in_fname.
	(c_common_post_options): Set some cpp options here.
	(c_common_init): Move from c-common.c.
	* cppinit.c (cpp_post_options): Don't canonicalize in_fname.
	* cpplib.h (struct cpp_options): Remove in_fname.
	(cpp_preprocess_file): Update.
	* cppmain.c (cpp_preprocess_file): Update for new prototypes.


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

1 files changed, 3 insertions, 2 deletions

diff --git a/gcc/cppmain.c b/gcc/cppmain.c
index adde66c1ad4..5efafd5cad9 100644
--- a/gcc/cppmain.c
+++ b/gcc/cppmain.c
@@ -67,8 +67,9 @@ static struct printer print;
 
 /* Preprocess and output.  */
 void
-cpp_preprocess_file (pfile, out_stream)
+cpp_preprocess_file (pfile, in_fname, out_stream)
      cpp_reader *pfile;
+     const char *in_fname;
      FILE *out_stream;
 {
   options = cpp_get_options (pfile);
@@ -84,7 +85,7 @@ cpp_preprocess_file (pfile, out_stream)
 
   setup_callbacks (pfile);
 
-  if (cpp_read_main_file (pfile, options->in_fname, NULL))
+  if (cpp_read_main_file (pfile, in_fname, NULL))
     {
       cpp_finish_options (pfile);