diff options
| author | Zack Weinberg <zack@gcc.gnu.org> | 2002-12-16 18:23:00 +0000 |
|---|---|---|
| committer | Zack Weinberg <zack@gcc.gnu.org> | 2002-12-16 18:23:00 +0000 |
| commit | 4977bab6ed59f01c73f9c8b9e92298706df9b6d5 (patch) | |
| tree | c259697c448b0c6f548f153c48c46a8d7a75970f /gcc/conflict.c | |
| parent | b51dc045004ee7eb8d2bf4358ddf22a6cc6c1d00 (diff) | |
| download | gcc-4977bab6ed59f01c73f9c8b9e92298706df9b6d5.zip gcc-4977bab6ed59f01c73f9c8b9e92298706df9b6d5.tar.gz gcc-4977bab6ed59f01c73f9c8b9e92298706df9b6d5.tar.bz2 | |
Merge basic-improvements-branch to trunk
From-SVN: r60174
Diffstat (limited to 'gcc/conflict.c')
| -rw-r--r-- | gcc/conflict.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/gcc/conflict.c b/gcc/conflict.c index a6d7554..3848b37 100644 --- a/gcc/conflict.c +++ b/gcc/conflict.c @@ -27,6 +27,8 @@ Software Foundation, 59 Temple Place - Suite 330, Boston, MA #include "config.h" #include "system.h" +#include "coretypes.h" +#include "tm.h" #include "obstack.h" #include "hashtab.h" #include "rtl.h" |