From 223568fbcd2f4ec295d932f5d71fe4b18bb279d3 Mon Sep 17 00:00:00 2001 From: Chad Versace Date: Mon, 1 Nov 2010 14:23:53 -0700 Subject: [PATCH] mesa: Fix C++ includes in sampler.cpp Some C++ header files were included in an extern "C" block. When building with Clang, this caused the build to fail due to namespace errors. (GCC did not report any errors.) Reviewed-by: Ian Romanick Reviewed-by: Brian Paul --- src/mesa/program/sampler.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/program/sampler.cpp b/src/mesa/program/sampler.cpp index 0e58aef9c95..9a813c87955 100644 --- a/src/mesa/program/sampler.cpp +++ b/src/mesa/program/sampler.cpp @@ -23,15 +23,15 @@ * DEALINGS IN THE SOFTWARE. */ -#include +#include +#include "ir.h" +#include "glsl_types.h" +#include "ir_visitor.h" extern "C" { #include "main/compiler.h" #include "main/mtypes.h" #include "program/prog_parameter.h" -#include "ir.h" -#include "ir_visitor.h" -#include "glsl_types.h" } static void fail_link(struct gl_shader_program *prog, const char *fmt, ...) PRINTFLIKE(2, 3); -- 2.30.2