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

@@ -11,7 +11,9 @@
#include "gen/cl_helpers.h"
#include "llvm/Target/TargetMachine.h"
#if LDC_LLVM_VER >= 302
#if LDC_LLVM_VER >= 303
#include "llvm/IR/DataLayout.h"
#elif LDC_LLVM_VER == 302
#include "llvm/DataLayout.h"
#else
#include "llvm/Target/TargetData.h"