cpperror.c (cpp_print_containing_files): Fix formatting bug induced by merge.

1999-02-04 16:04 -0500  Zack Weinberg  <zack@rabi.columbia.edu>
	* cpperror.c (cpp_print_containing_files): Fix formatting
	bug induced by merge.

From-SVN: r25025

gcc/ChangeLog

+1999-02-04 16:04 -0500  Zack Weinberg  <zack@rabi.columbia.edu>
+
+	* cpperror.c (cpp_print_containing_files): Fix formatting 
+	bug induced by merge.
+
 Thu Feb  4 10:46:30 1999  Gavin Romig-Koch  <gavin@cygnus.com>
 
        * config/mips/mips.md ([u]divmodsi4,[u]divmoddi4,[u]divsi3,[u]divdi3,

gcc/cpperror.c

@@ -63,16 +63,16 @@ cpp_print_containing_files (pfile)
 	  if (first)
 	    {
 	      first = 0;
-	      cpp_notice ("In file included from ");
+	      cpp_notice ("In file included from %s:%ld",
+			  ip->nominal_fname, line);
 	    }
 	  else
-	    cpp_notice (",\n                 from ");
+	    cpp_message (pfile, -1, ",\n                 from %s:%ld",
+			 ip->nominal_fname, line);
 	}
-
-      fprintf (stderr, " from %s:%ld", ip->nominal_fname, line);
     }
   if (! first)
-    fprintf (stderr, ":\n");
+    fputs (":\n", stderr);
 
   /* Record we have printed the status as of this time.  */
   pfile->input_stack_listing_current = 1;