summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gallium/auxiliary/gallivm/lp_bld_type.h7
-rw-r--r--src/gallium/drivers/swr/swr_screen.cpp4
2 files changed, 7 insertions, 4 deletions
diff --git a/src/gallium/auxiliary/gallivm/lp_bld_type.h b/src/gallium/auxiliary/gallivm/lp_bld_type.h
index 7fb449fd03f..afe8722b05a 100644
--- a/src/gallium/auxiliary/gallivm/lp_bld_type.h
+++ b/src/gallium/auxiliary/gallivm/lp_bld_type.h
@@ -41,6 +41,10 @@
#include "pipe/p_compiler.h"
#include "gallivm/lp_bld.h"
+#ifdef __cplusplus
+extern "C" {
+#endif
+
/**
* Native SIMD architecture width available at runtime.
*
@@ -449,5 +453,8 @@ lp_build_context_init(struct lp_build_context *bld,
unsigned
lp_build_count_ir_module(LLVMModuleRef module);
+#ifdef __cplusplus
+}
+#endif
#endif /* !LP_BLD_TYPE_H */
diff --git a/src/gallium/drivers/swr/swr_screen.cpp b/src/gallium/drivers/swr/swr_screen.cpp
index ad270e5bea2..6ff21cdf186 100644
--- a/src/gallium/drivers/swr/swr_screen.cpp
+++ b/src/gallium/drivers/swr/swr_screen.cpp
@@ -39,10 +39,6 @@
#include "state_tracker/sw_winsys.h"
-extern "C" {
-#include "gallivm/lp_bld_limits.h"
-}
-
#include "jit_api.h"
#include "memory/TilingFunctions.h"