2001-07-10 Jan van Male <jan.vanmale@fenk.wau.nl>

[pf3gnuchains/gcc-fork.git] / gcc / fix-header.c

diff --git a/gcc/fix-header.c b/gcc/fix-header.c
index 11b1141..8d80128 100644 (file)
--- a/gcc/fix-header.c
+++ b/gcc/fix-header.c
@@ -532,8 +532,8 @@ recognized_function (fname, line, kind, have_arg_list)
     missing_extern_C_count++;
 #endif
 
-  fn = lookup_std_proto ((const char *)fname->val.node->name,
-                        fname->val.node->length);
+  fn = lookup_std_proto ((const char *) NODE_NAME (fname->val.node),
+                        NODE_LEN (fname->val.node));
 
   /* Remove the function from the list of required function.  */
   if (fn)
@@ -613,19 +613,24 @@ read_scan_file (in_fname, argc, argv)
      char **argv;
 {
   cpp_reader* scan_in;
+  cpp_callbacks *cb;
+  cpp_options *options;
   struct fn_decl *fn;
   int i;
   register struct symbol_list *cur_symbols;
 
   obstack_init (&scan_file_obstack); 
 
-  scan_in = cpp_create_reader (CLK_GNUC89);
-  scan_in->cb.file_change = cb_file_change;
+  scan_in = cpp_create_reader (NULL, CLK_GNUC89);
+  cb = cpp_get_callbacks (scan_in);
+  cb->file_change = cb_file_change;
 
   /* We are going to be scanning a header file out of its proper context,
      so ignore warnings and errors.  */
-  CPP_OPTION (scan_in, inhibit_warnings) = 1;
-  CPP_OPTION (scan_in, inhibit_errors) = 1;
+  options = cpp_get_options (scan_in);
+  options->inhibit_warnings = 1;
+  options->inhibit_errors = 1;
+
   i = cpp_handle_options (scan_in, argc, argv);
   if (i < argc && ! CPP_FATAL_ERRORS (scan_in))
     cpp_fatal (scan_in, "Invalid option `%s'", argv[i]);
@@ -1318,12 +1323,12 @@ fatal VPARAMS ((const char *str, ...))
 #endif
   va_list ap;
   
-  VA_START(ap, str);
+  VA_START (ap, str);
 
 #ifndef ANSI_PROTOTYPES
   str = va_arg (ap, const char *);
 #endif
 
-  v_fatal(str, ap);
-  va_end(ap);
+  v_fatal (str, ap);
+  va_end (ap);
 }