diff options
| author | Ian Romanick <[email protected]> | 2011-09-11 16:10:33 -0500 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2011-10-18 17:26:38 -0700 |
| commit | bbbb8345ab9df2d634dc2a34d257ee2cbf930292 (patch) | |
| tree | cd7579458a88a83b4e9d6a77e463f9ab085c514d /src/glsl | |
| parent | 1375d67984f0cd01efa7b256864f21dc4ff75982 (diff) | |
ir_to_mesa: Move some things outside the 'extern "C"' blocks
Having a few of these includes or forward declarations inside the
'extern "C"' block can cause problems later. Specifically, it
prevents C++ linkage functions from being added to ir_to_mesa.h and
makes G++ angry if 'struct foo' is seen both inside and outside an
'extern "C"'.
Signed-off-by: Ian Romanick <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Diffstat (limited to 'src/glsl')
| -rw-r--r-- | src/glsl/ir_clone.cpp | 2 | ||||
| -rw-r--r-- | src/glsl/ir_print_visitor.cpp | 3 | ||||
| -rw-r--r-- | src/glsl/ir_set_program_inouts.cpp | 2 |
3 files changed, 0 insertions, 7 deletions
diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp index c1befa95ce9..9adf47050d1 100644 --- a/src/glsl/ir_clone.cpp +++ b/src/glsl/ir_clone.cpp @@ -25,9 +25,7 @@ #include "main/compiler.h" #include "ir.h" #include "glsl_types.h" -extern "C" { #include "program/hash_table.h" -} /** * Duplicate an IR variable diff --git a/src/glsl/ir_print_visitor.cpp b/src/glsl/ir_print_visitor.cpp index ea7858224bb..b713bd03ba0 100644 --- a/src/glsl/ir_print_visitor.cpp +++ b/src/glsl/ir_print_visitor.cpp @@ -24,10 +24,7 @@ #include "ir_print_visitor.h" #include "glsl_types.h" #include "glsl_parser_extras.h" - -extern "C" { #include "program/hash_table.h" -} static void print_type(const glsl_type *t); diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/glsl/ir_set_program_inouts.cpp index 3b10b909724..ae3ef74c75e 100644 --- a/src/glsl/ir_set_program_inouts.cpp +++ b/src/glsl/ir_set_program_inouts.cpp @@ -34,10 +34,8 @@ * from the GLSL IR. */ -extern "C" { #include "main/core.h" /* for struct gl_program */ #include "program/hash_table.h" -} #include "ir.h" #include "ir_visitor.h" #include "glsl_types.h" |