From c6e8d2c6593820e48eb2f1088c4d06ad633e509e Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Mon, 15 Dec 2014 17:05:53 -0700 Subject: [PATCH] st/mesa: remove extern "C" around #includes in st_glsl_to_tgsi.cpp Reviewed-by: Anuj Phogat Reviewed-by: Jose Fonseca --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp index 5bc70a4925b..2631348069c 100644 --- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp +++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp @@ -44,10 +44,8 @@ #include "main/mtypes.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" @@ -67,7 +65,7 @@ extern "C" { #include "st_program.h" #include "st_glsl_to_tgsi.h" #include "st_mesa_to_tgsi.h" -} + #define PROGRAM_IMMEDIATE PROGRAM_FILE_MAX #define PROGRAM_ANY_CONST ((1 << PROGRAM_STATE_VAR) | \ -- 2.30.2