summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/swr/swr_state.cpp
diff options
context:
space:
mode:
authorTim Rowley <[email protected]>2016-06-16 21:09:35 -0500
committerTim Rowley <[email protected]>2016-06-23 09:58:08 -0500
commit9ca741c64524a57f972ce050919a0e2dec3e64f3 (patch)
tree07405cadcc92038e8f8e3f48a0976292797a0806 /src/gallium/drivers/swr/swr_state.cpp
parent805dbdf06d98e6dcfe0b24e38cc13c88eb5f36be (diff)
swr: push/pop DEBUG macro around llvm includes
llvm redefines DEBUG; adding push/pop prevents a undefined reference to debug_refcnt_state in llvm-3.7+. v2: add undef DEBUG Cc: "12.0" <[email protected]> Reviewed-by: Bruce Cherniak <[email protected]>
Diffstat (limited to 'src/gallium/drivers/swr/swr_state.cpp')
-rw-r--r--src/gallium/drivers/swr/swr_state.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/swr/swr_state.cpp b/src/gallium/drivers/swr/swr_state.cpp
index 31745fca602..5caaa5c7139 100644
--- a/src/gallium/drivers/swr/swr_state.cpp
+++ b/src/gallium/drivers/swr/swr_state.cpp
@@ -21,9 +21,14 @@
* IN THE SOFTWARE.
***************************************************************************/
+// llvm redefines DEBUG
+#pragma push_macro("DEBUG")
+#undef DEBUG
+#include "JitManager.h"
+#pragma pop_macro("DEBUG")
+
#include "common/os.h"
#include "jit_api.h"
-#include "JitManager.h"
#include "state_llvm.h"
#include "gallivm/lp_bld_tgsi.h"