From 36ad8265489fc66ab45b9b74dafa353a93bdb03b Mon Sep 17 00:00:00 2001 From: George Kyriazis Date: Wed, 4 Jan 2017 13:13:36 -0600 Subject: [PATCH] swr: fix windows build break wrap lp_bld_type.h around extern "C". Windows decorates global variables, so when used from .cpp files, need to use an undecorated version. Also, removed related and unneeded code from swr_screen.cpp Reviewed-by: Ilia Mirkin --- src/gallium/auxiliary/gallivm/lp_bld_type.h | 7 +++++++ src/gallium/drivers/swr/swr_screen.cpp | 4 ---- 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" -- 2.30.2