diff options
| author | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-12-01 13:15:28 +0000 |
|---|---|---|
| committer | bstarynk <bstarynk@138bc75d-0d04-0410-961f-82ee72b054a4> | 2010-12-01 13:15:28 +0000 |
| commit | feeb6596a18e42225d0f25a03b35c564d9a10ebb (patch) | |
| tree | 7e6fb5e50aa3f901480410fc04ba058b6f0e94fa /gcc/java/boehm.c | |
| parent | acc16a01c06415b69d0a54c9e86f4ec72665ee54 (diff) | |
| download | gcc-feeb6596a18e42225d0f25a03b35c564d9a10ebb.tar.gz | |
2010-12-01 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 167323
2010-12-01 Basile Starynkevitch <basile@starynkevitch.net>
{{merged with trunk rev 167323, and regenerated}}
* melt/generated/warmelt-normatch.0+01.c: Regenerate.
* melt/generated/warmelt-first.0.c: Regenerate.
* melt/generated/warmelt-normal.0.c: Regenerate.
* melt/generated/warmelt-normatch.0+03.c: Regenerate.
* melt/generated/warmelt-macro.0.c: Regenerate.
* melt/generated/warmelt-outobj.0.c: Regenerate.
* melt/generated/warmelt-genobj.0.c: Regenerate.
* melt/generated/warmelt-normal.0+01.c: Regenerate.
* melt/generated/warmelt-normal.0+02.c: Regenerate.
* melt/generated/warmelt-base.0.c: Regenerate.
* melt/generated/warmelt-normatch.0.c: Regenerate.
* melt/generated/warmelt-genobj.0+01.c: Regenerate.
* melt/generated/warmelt-genobj.0+03.c: Regenerate.
* melt/generated/warmelt-genobj.0+04.c: Regenerate.
* melt/generated/warmelt-debug.0.c: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/melt-branch@167327 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/java/boehm.c')
| -rw-r--r-- | gcc/java/boehm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/gcc/java/boehm.c b/gcc/java/boehm.c index 2a0690ce51d..f4a9af61939 100644 --- a/gcc/java/boehm.c +++ b/gcc/java/boehm.c @@ -1,5 +1,6 @@ /* Functions related to the Boehm garbage collector. - Copyright (C) 2000, 2003, 2004, 2006, 2009 Free Software Foundation, Inc. + Copyright (C) 2000, 2003, 2004, 2006, 2009, 2010 + Free Software Foundation, Inc. This file is part of GCC. @@ -23,8 +24,7 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ /* Written by Tom Tromey <tromey@cygnus.com>. */ -#include <config.h> - +#include "config.h" #include "system.h" #include "coretypes.h" #include "double-int.h" @@ -33,7 +33,6 @@ The Free Software Foundation is independent of Sun Microsystems, Inc. */ #include "java-tree.h" #include "parse.h" #include "diagnostic-core.h" -#include "toplev.h" static void mark_reference_fields (tree, double_int *, unsigned int, int *, int *, int *, HOST_WIDE_INT *); |