Mesa (master): st/mesa: remove extern "C" around #includes in st_glsl_to_tgsi.cpp
Brian Paul
brianp at kemper.freedesktop.org
Tue Dec 16 15:51:40 UTC 2014
Module: Mesa
Branch: master
Commit: c6e8d2c6593820e48eb2f1088c4d06ad633e509e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=c6e8d2c6593820e48eb2f1088c4d06ad633e509e
Author: Brian Paul <brianp at vmware.com>
Date: Mon Dec 15 17:05:53 2014 -0700
st/mesa: remove extern "C" around #includes in st_glsl_to_tgsi.cpp
Reviewed-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Jose Fonseca <jfonseca at vmware.com>
---
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 5bc70a4..2631348 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) | \
More information about the mesa-commit
mailing list