From: Brian Paul <brianp@vmware.com>
Date: Mon, 15 Dec 2014 23:41:58 +0000 (-0700)
Subject: glsl: remove extern "C" around #includes
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=241c599cb109d022ab44aa84ad823ca7a13b32fa;p=mesa.git

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 dd02a808e0d..27e2eaf372f 100644
--- 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 5f991934856..0d2eb7cec09 100644
--- 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 6713df14a08..44468c78a15 100644
--- 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 *, ...);