diff options
| author | Brian Paul <brianp@vmware.com> | 2014-12-15 16:41:58 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2014-12-16 07:52:41 -0700 |
| commit | 241c599cb109d022ab44aa84ad823ca7a13b32fa (patch) | |
| tree | 26070cc1dba0107e96be2ffba11a0d0299c85fc9 | |
| parent | 44c8957cfe7a77f53dbf21dcad8f43e20b4475ab (diff) | |
| download | external_mesa3d-241c599cb109d022ab44aa84ad823ca7a13b32fa.zip external_mesa3d-241c599cb109d022ab44aa84ad823ca7a13b32fa.tar.gz external_mesa3d-241c599cb109d022ab44aa84ad823ca7a13b32fa.tar.bz2 | |
glsl: remove extern "C" around #includes
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Jose Fonseca <jfonseca@vmware.com>
| -rw-r--r-- | src/glsl/glsl_parser_extras.cpp | 3 | ||||
| -rw-r--r-- | src/glsl/glsl_types.cpp | 3 | ||||
| -rw-r--r-- | src/glsl/linker.cpp | 3 |
3 files changed, 2 insertions, 7 deletions
diff --git a/src/glsl/glsl_parser_extras.cpp b/src/glsl/glsl_parser_extras.cpp index dd02a80..27e2eaf3 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 5f99193..0d2eb7c 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 6713df1..44468c7 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 *, ...); |