Mesa (master): gallivm: Wrap deleted inlcude in if HAVE_LLVM < 0x0306
Tom Stellard
tstellar at kemper.freedesktop.org
Wed Sep 24 16:56:42 UTC 2014
Module: Mesa
Branch: master
Commit: 180b152b247594bd8a72bc5b4d90a701c5341063
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=180b152b247594bd8a72bc5b4d90a701c5341063
Author: Tom Stellard <thomas.stellard at amd.com>
Date: Wed Sep 24 11:46:09 2014 -0400
gallivm: Wrap deleted inlcude in if HAVE_LLVM < 0x0306
This was missed in 8f4ee56.
---
src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
index 1c42e8f..06d29bc 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp
@@ -55,7 +55,9 @@
#include <llvm/Target/TargetOptions.h>
#include <llvm/ExecutionEngine/ExecutionEngine.h>
#include <llvm/ADT/Triple.h>
+#if HAVE_LLVM < 0x0306
#include <llvm/ExecutionEngine/JITMemoryManager.h>
+#endif
#include <llvm/Support/CommandLine.h>
#include <llvm/Support/Host.h>
#include <llvm/Support/PrettyStackTrace.h>
More information about the mesa-commit
mailing list