* combine.c (if_then_else_cond): Tighten mode check.

[pf3gnuchains/gcc-fork.git] / gcc / diagnostic.h

diff --git a/gcc/diagnostic.h b/gcc/diagnostic.h
index 1a26553..cf331e0 100644 (file)
--- a/gcc/diagnostic.h
+++ b/gcc/diagnostic.h
@@ -57,7 +57,7 @@ typedef diagnostic_starter_fn diagnostic_finalizer_fn;
    the context of a diagnostic message.  */
 struct diagnostic_context
 {
-  /* Where most of the diagnostic formatting work is done.   */
+  /* Where most of the diagnostic formatting work is done.  */
   pretty_printer *printer;
 
   /* The number of times we have issued diagnostics.  */
@@ -110,7 +110,7 @@ struct diagnostic_context
 #define diagnostic_auxiliary_data(DC) (DC)->x_data
 
 /* Same as pp_format_decoder.  Works on 'diagnostic_context *'.  */
-#define diagnostic_format_decoder(DC) pp_format_decoder ((DC)->printer)
+#define diagnostic_format_decoder(DC) ((DC)->printer->format_decoder)
 
 /* Same as output_prefixing_rule.  Works on 'diagnostic_context *'.  */
 #define diagnostic_prefixing_rule(DC) ((DC)->printer->prefixing_rule)
@@ -119,7 +119,7 @@ struct diagnostic_context
    Zero means don't wrap lines.  */
 #define diagnostic_line_cutoff(DC) ((DC)->printer->ideal_maximum_length)
 
-#define diagnostic_flush_buffer(DC) pp_flush ((DC)->printer)
+#define diagnostic_flush_buffer(DC) pp_base_flush ((DC)->printer)
 
 /* True if the last function in which a diagnostic was reported is
    different from the current one.  */