aboutsummaryrefslogtreecommitdiff
path: root/gcc/pretty-print.h
diff options
context:
space:
mode:
authorJason Merrill <jason@redhat.com>2011-06-07 17:52:46 -0400
committerJason Merrill <jason@gcc.gnu.org>2011-06-07 17:52:46 -0400
commit6976ae513f494a12d8dbc4c80d2b0dcd85a5c7c0 (patch)
treecd3370eefb28aa48d04d2f202735041192d37e39 /gcc/pretty-print.h
parent338efe0d54885f66865f9c09f87ee413f7b6f1a2 (diff)
downloadgcc-6976ae513f494a12d8dbc4c80d2b0dcd85a5c7c0.zip
gcc-6976ae513f494a12d8dbc4c80d2b0dcd85a5c7c0.tar.gz
gcc-6976ae513f494a12d8dbc4c80d2b0dcd85a5c7c0.tar.bz2
pretty-print.h (ATTRIBUTE_GCC_PPDIAG): Use GCC_DIAG_STYLE if set.
gcc/ * pretty-print.h (ATTRIBUTE_GCC_PPDIAG): Use GCC_DIAG_STYLE if set. gcc/c-family/ * c-format.c (gcc_cxxdiag_char_table): Add 'S' format. From-SVN: r174770
Diffstat (limited to 'gcc/pretty-print.h')
-rw-r--r--gcc/pretty-print.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/gcc/pretty-print.h b/gcc/pretty-print.h
index 3b6d18e..ae1dadf 100644
--- a/gcc/pretty-print.h
+++ b/gcc/pretty-print.h
@@ -303,10 +303,18 @@ extern const char *pp_base_last_position_in_text (const pretty_printer *);
extern void pp_base_emit_prefix (pretty_printer *);
extern void pp_base_append_text (pretty_printer *, const char *, const char *);
+/* If we haven't already defined a front-end-specific diagnostics
+ style, use the generic one. */
+#ifdef GCC_DIAG_STYLE
+#define GCC_PPDIAG_STYLE GCC_DIAG_STYLE
+#else
+#define GCC_PPDIAG_STYLE __gcc_diag__
+#endif
+
/* This header may be included before diagnostics-core.h, hence the duplicate
definitions to allow for GCC-specific formats. */
#if GCC_VERSION >= 3005
-#define ATTRIBUTE_GCC_PPDIAG(m, n) __attribute__ ((__format__ (__gcc_diag__, m ,n))) ATTRIBUTE_NONNULL(m)
+#define ATTRIBUTE_GCC_PPDIAG(m, n) __attribute__ ((__format__ (GCC_PPDIAG_STYLE, m ,n))) ATTRIBUTE_NONNULL(m)
#else
#define ATTRIBUTE_GCC_PPDIAG(m, n) ATTRIBUTE_NONNULL(m)
#endif