From 6d2f59fd94432a31a65797c19b98ea04296909c9 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 15 Dec 2014 17:04:38 -0700 Subject: [PATCH] program: remove extern "C" around #includes Reviewed-by: Anuj Phogat Reviewed-by: Jose Fonseca --- src/mesa/program/ir_to_mesa.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/mesa/program/ir_to_mesa.cpp b/src/mesa/program/ir_to_mesa.cpp index 5196545b8ae..ce3af312083 100644 --- a/src/mesa/program/ir_to_mesa.cpp +++ b/src/mesa/program/ir_to_mesa.cpp @@ -43,19 +43,18 @@ #include "linker.h" #include "main/mtypes.h" +#include "main/shaderapi.h" #include "main/shaderobj.h" #include "main/uniforms.h" -#include "program/hash_table.h" -extern "C" { -#include "main/shaderapi.h" +#include "program/hash_table.h" #include "program/prog_instruction.h" #include "program/prog_optimize.h" #include "program/prog_print.h" #include "program/program.h" #include "program/prog_parameter.h" #include "program/sampler.h" -} + static int swizzle_for_size(int size); -- 2.30.2