Merge branch 'master' into merge-2.061-2

This commit is contained in:
David Nadlinger
2013-01-12 01:27:02 +01:00
30 changed files with 134 additions and 43 deletions

View File

@@ -7,8 +7,13 @@
//
//===----------------------------------------------------------------------===//
#if LDC_LLVM_VER >= 303
#include "llvm/IR/DerivedTypes.h"
#include "llvm/IR/LLVMContext.h"
#else
#include "llvm/DerivedTypes.h"
#include "llvm/LLVMContext.h"
#endif
#include "mars.h"
#include "mtype.h"
#include "gen/irstate.h"