From f631a6ae8c951fc448618c1770f95ad93cac812b Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Tue, 16 Jan 2018 21:58:58 -0700 Subject: [PATCH] glsl: remove unneeded extern "C" {} bracketing around Mesa includes MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The two headers already have the right extern "C" annotations. Reviewed-by: Nicolai Hähnle --- src/compiler/glsl/serialize.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/compiler/glsl/serialize.cpp b/src/compiler/glsl/serialize.cpp index 769ab560c87..63ce41d87bd 100644 --- a/src/compiler/glsl/serialize.cpp +++ b/src/compiler/glsl/serialize.cpp @@ -33,13 +33,11 @@ #include "compiler/shader_info.h" #include "ir_uniform.h" #include "main/mtypes.h" +#include "main/shaderobj.h" +#include "program/program.h" #include "string_to_uint_map.h" #include "util/bitscan.h" -extern "C" { -#include "main/shaderobj.h" -#include "program/program.h" -} static void write_subroutines(struct blob *metadata, struct gl_shader_program *prog) -- 2.30.2