aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorZack Weinberg <zack@rabi.columbia.edu>1999-02-04 13:06:30 +0000
committerZack Weinberg <zack@gcc.gnu.org>1999-02-04 13:06:30 +0000
commit74c9467af51e9d9b606c1592fd4cfdecbd1ddcb3 (patch)
tree62f3700cf979a16092b73b57d64067ad65eef6d1 /gcc
parent5538ada62ffabf0bd01e583416641137205ff7b7 (diff)
downloadgcc-74c9467af51e9d9b606c1592fd4cfdecbd1ddcb3.zip
gcc-74c9467af51e9d9b606c1592fd4cfdecbd1ddcb3.tar.gz
gcc-74c9467af51e9d9b606c1592fd4cfdecbd1ddcb3.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/cpperror.c10
2 files changed, 10 insertions, 5 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3a22288..793d7aa 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+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,
diff --git a/gcc/cpperror.c b/gcc/cpperror.c
index 4a4cc07..af01881 100644
--- a/gcc/cpperror.c
+++ b/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;