diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-21 10:28:21 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-21 10:28:21 +0000 |
| commit | 489d628676eaa4d7030b588030a12db7ee5c1ac9 (patch) | |
| tree | 71d8cfd054865924dfb5996209f60caf891afb1e /gcc/melt-run.proto.h | |
| parent | 95dcf01932d73ac487a4a640375d4830b6ed874c (diff) | |
| download | gcc-489d628676eaa4d7030b588030a12db7ee5c1ac9.tar.gz | |
2011-07-21 Basile Starynkevitch <basile@starynkevitch.net>
* melt-runtime.c: Update contributors list. Include "c-pragma.h" &
"c-pretty-print.h", conditionally with "c-family/" directory.
Move "diagnostic.h" include.
(load_checked_dynamic_module_index): Add inform "Consider removing
MELT generated files."
* melt-run.proto.h: Update contributors list.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@176559 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/melt-run.proto.h')
| -rw-r--r-- | gcc/melt-run.proto.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/gcc/melt-run.proto.h b/gcc/melt-run.proto.h index ae99410bcd3..64ef846731b 100644 --- a/gcc/melt-run.proto.h +++ b/gcc/melt-run.proto.h @@ -3,7 +3,9 @@ all include files for generated code Copyright (C) 2008,2009,2011 Free Software Foundation, Inc. - Contributed by Basile Starynkevitch <basile@starynkevitch.net> + Contributed by Basile Starynkevitch <basile@starynkevitch.net> + and Pierre Vittet <piervit@pvittet.com> + and Romain Geissler <romain.geissler@gmail.com> This file is part of GCC. It is produced from melt-run.proto.h @@ -52,6 +54,19 @@ along with GCC; see the file COPYING3. If not see #include "timevar.h" #include "ggc.h" #include "cgraph.h" + + +/* Headers from c-family/ should be included directly with GCC4.6, but + not with GCC 4.7 or when compiling with a C++ compiler. And they + need to be include before diagnostics.h. */ +#if defined(GCCPLUGIN_VERSION) || MELT_GCC_VERSION>4006 || defined(__cplusplus) +#include "c-family/c-pragma.h" +#include "c-family/c-pretty-print.h" +#else +#include "c-pragma.h" +#include "c-pretty-print.h" +#endif + #include "diagnostic.h" #include "flags.h" #include "toplev.h" |