glsl: remove extern "C" around #includes

Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>

diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp
index dd02a808e0db648fda1b45d850e425f324552a13..27e2eaf372ff988e25b65fa89c8d138fef353c17 100644 (file)
--- a/src/glsl/glsl_parser_extras.cpp
+++ b/src/glsl/glsl_parser_extras.cpp
@@ -25,13 +25,10 @@
 #include <string.h>
 #include <assert.h>
 
-extern "C" {
 #include "main/core.h" /* for struct gl_context */
 #include "main/context.h"
 #include "main/shaderobj.h"
 #include "util/u_atomic.h" /* for p_atomic_cmpxchg */
-}
-
 #include "util/ralloc.h"
 #include "ast.h"
 #include "glsl_parser_extras.h"

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index 5f9919348563e122d0037e0d8532d63e4bc23f91..0d2eb7cec0980093fdbabdffcec1e70af818056c 100644 (file)
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -25,9 +25,8 @@
 #include "main/core.h" /* for Elements, MAX2 */
 #include "glsl_parser_extras.h"
 #include "glsl_types.h"
-extern "C" {
 #include "program/hash_table.h"
-}
+
 
 mtx_t glsl_type::mutex = _MTX_INITIALIZER_NP;
 hash_table *glsl_type::array_types = NULL;

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index 6713df14a0852d45ab3d40ff847baa7337b61193..44468c78a15e8d02d7a9eec4f43c6891e67ccedc 100644 (file)
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -76,10 +76,9 @@
 #include "ir_rvalue_visitor.h"
 #include "ir_uniform.h"
 
-extern "C" {
 #include "main/shaderobj.h"
 #include "main/enums.h"
-}
+
 
 void linker_error(gl_shader_program *, const char *, ...);