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

@@ -47,9 +47,15 @@
#endif
#if IN_LLVM
#if LDC_LLVM_VER >= 303
#include "llvm/IR/Type.h"
#include "llvm/IR/LLVMContext.h"
#include "llvm/IR/DerivedTypes.h"
#else
#include "llvm/Type.h"
#include "llvm/LLVMContext.h"
#include "llvm/DerivedTypes.h"
#endif
#include "llvm/Support/CommandLine.h"
#include <map>