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

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a8b38dff93fdb5e83ac321fe84f412989cb3e7ed..b855ceca84a419df0ce8016d27b17d1289af3e9a 100644 (file)
--- 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 0e4aa2219a04832cbd5146428c6976a5d3f717d5..e31c1fbbd100d08fa32048fa9dc51f72681279b9 100644 (file)
--- 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 27a77ea569eaa6be22d6626c811b09493d5b91c0..993fde7a6d691fe6ca6fcf1ed7e44366d71cf2a5 100644 (file)
--- 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