aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPer Bothner <per@bothner.com>2003-12-19 22:32:32 -0800
committerPer Bothner <bothner@gcc.gnu.org>2003-12-19 22:32:32 -0800
commit7b330e081884a96c5e83bc0b42f8f22d62a42357 (patch)
tree71d0b85d418f4565391e78a296bf33d6c55051a7
parentf3da0ead0c5c3772c8322cc4aad8deeb382ef2dd (diff)
downloadgcc-7b330e081884a96c5e83bc0b42f8f22d62a42357.zip
gcc-7b330e081884a96c5e83bc0b42f8f22d62a42357.tar.gz
gcc-7b330e081884a96c5e83bc0b42f8f22d62a42357.tar.bz2
re PR c/13110 (error message includes extra blank line)
* langhooks.c (lhd_print_error_function): Fix for PR c/13110. Don't do pp_newline; it causes an extra blank line. * pretty-print.c (pp_base_flush): Clear pp_needs_newline. From-SVN: r74872
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/langhooks.c1
-rw-r--r--gcc/pretty-print.c1
3 files changed, 7 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a8b38df..b855cec 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2003-12-19 Per Bothner <per@bothner.com>
+
+ * langhooks.c (lhd_print_error_function): Fix for PR c/13110.
+ Don't do pp_newline; it causes an extra blank line.
+ * pretty-print.c (pp_base_flush): Clear pp_needs_newline.
+
2003-12-19 Jason Merrill <jason@redhat.com>
* tree.c (get_unwidened): Decide whether to narrow a bitfield
diff --git a/gcc/langhooks.c b/gcc/langhooks.c
index 0e4aa22..e31c1fb 100644
--- a/gcc/langhooks.c
+++ b/gcc/langhooks.c
@@ -545,7 +545,6 @@ lhd_print_error_function (diagnostic_context *context, const char *file)
(context->printer, "In function `%s':",
(*lang_hooks.decl_printable_name) (current_function_decl, 2));
}
- pp_newline (context->printer);
diagnostic_set_last_function (context);
pp_flush (context->printer);
diff --git a/gcc/pretty-print.c b/gcc/pretty-print.c
index 27a77ea..993fde7 100644
--- a/gcc/pretty-print.c
+++ b/gcc/pretty-print.c
@@ -343,6 +343,7 @@ pp_base_flush (pretty_printer *pp)
pp_clear_state (pp);
fputc ('\n', pp->buffer->stream);
fflush (pp->buffer->stream);
+ pp_needs_newline (pp) = false;
}
/* Sets the number of maximum characters per line PRETTY-PRINTER can