diff options
| author | Steven Bosscher <steven@gcc.gnu.org> | 2010-05-28 23:15:55 +0000 |
|---|---|---|
| committer | Steven Bosscher <steven@gcc.gnu.org> | 2010-05-28 23:15:55 +0000 |
| commit | 59cc9210fc47a5b2af679803c65669e7e501f0ab (patch) | |
| tree | bbef9c35e3335826695cecc5a96f08d7e888cedd /gcc/c-tree.h | |
| parent | bffad7f1cf127cbc4b103db2f30317e9f59422fd (diff) | |
| download | gcc-59cc9210fc47a5b2af679803c65669e7e501f0ab.zip gcc-59cc9210fc47a5b2af679803c65669e7e501f0ab.tar.gz gcc-59cc9210fc47a5b2af679803c65669e7e501f0ab.tar.bz2 | |
c-common.h (GCC_DIAG_STYLE): Define earlier in the file, before including diagnostic-core.h.
gcc/ChangeLog:
* c-common.h (GCC_DIAG_STYLE): Define earlier in the file,
before including diagnostic-core.h.
(c_cpp_error): New prototype moved from c-tree.h.
Use ATTRIBUTE_GCC_DIAG instead of ATTRIBUTE_GCC_CDIAG.
* c-tree.h (ATTRIBUTE_GCC_CDIAG): Remove define.
(pedwarn_c90, perwarn_c99): Use ATTRIBUTE_GCC_DIAG instead.
(c_cpp_error): Prototype moved to c-common.h.
* Makefile.in: Update dependency for C_COMMON_H.
cp/ChangeLog:
* cp-tree.h (ATTRIBUTE_GCC_CXXDIAG): Remove. Require that
this file is included before c-common.h. Define GCC_DIAG_STYLE
before including diagnostic-core.h and toplev.h.
(pedwarn_cxx98): Use ATTRIBUTE_GCC_DIAG.
* pt.c: Include cp-tree.h before c-common.h.
From-SVN: r160007
Diffstat (limited to 'gcc/c-tree.h')
| -rw-r--r-- | gcc/c-tree.h | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/gcc/c-tree.h b/gcc/c-tree.h index 6d8394a..30b5274 100644 --- a/gcc/c-tree.h +++ b/gcc/c-tree.h @@ -601,20 +601,8 @@ extern bool c_override_global_bindings_to_false; extern void c_finish_incomplete_decl (tree); extern void c_write_global_declarations (void); -/* In order for the format checking to accept the C frontend - diagnostic framework extensions, you must include this file before - toplev.h, not after. */ -#if GCC_VERSION >= 4001 -#define ATTRIBUTE_GCC_CDIAG(m, n) __attribute__ ((__format__ (GCC_DIAG_STYLE, m ,n))) ATTRIBUTE_NONNULL(m) -#else -#define ATTRIBUTE_GCC_CDIAG(m, n) ATTRIBUTE_NONNULL(m) -#endif - -extern void pedwarn_c90 (location_t, int opt, const char *, ...) ATTRIBUTE_GCC_CDIAG(3,4); -extern void pedwarn_c99 (location_t, int opt, const char *, ...) ATTRIBUTE_GCC_CDIAG(3,4); - -extern bool c_cpp_error (cpp_reader *, int, int, location_t, unsigned int, - const char *, va_list *) - ATTRIBUTE_GCC_CDIAG(6,0); +/* In c-errors.c */ +extern void pedwarn_c90 (location_t, int opt, const char *, ...) ATTRIBUTE_GCC_DIAG(3,4); +extern void pedwarn_c99 (location_t, int opt, const char *, ...) ATTRIBUTE_GCC_DIAG(3,4); #endif /* ! GCC_C_TREE_H */ |