diff dmd/aggregate.h @ 1630:44b145be2ef5

Merge dmd 1.056.
author Robert Clipsham <robert@octarineparrot.com>
date Sat, 06 Feb 2010 15:53:52 +0000
parents ae8a94d87ca9
children
line wrap: on
line diff
--- a/dmd/aggregate.h	Wed Jan 06 19:53:35 2010 +0100
+++ b/dmd/aggregate.h	Sat Feb 06 15:53:52 2010 +0000
@@ -19,9 +19,11 @@
 
 #include "dsymbol.h"
 
+#if IN_LLVM
 #include <vector>
 #include <set>
 #include <map>
+#endif
 
 struct Identifier;
 struct Type;
@@ -38,6 +40,7 @@
 struct VarDeclaration;
 struct dt_t;
 
+#if IN_LLVM
 namespace llvm
 {
     class Type;
@@ -46,6 +49,7 @@
     class ConstantStruct;
     class GlobalVariable;
 }
+#endif
 
 struct AggregateDeclaration : ScopeDsymbol
 {