st/mesa: remove extern "C" around #includes in st_glsl_to_tgsi.cpp
authorBrian Paul <brianp@vmware.com>
Tue, 16 Dec 2014 00:05:53 +0000 (17:05 -0700)
committerBrian Paul <brianp@vmware.com>
Tue, 16 Dec 2014 14:52:41 +0000 (07:52 -0700)
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
src/mesa/state_tracker/st_glsl_to_tgsi.cpp

index 5bc70a4925bcab6f92bb8aa20dc9eedc0f797211..2631348069c7844bc75929e6c87394ce97fd77e4 100644 (file)
 #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) |    \