glsl2: Wrap includes of C interfaces with extern "C".

diff --git a/src/glsl/ast_type.cpp b/src/glsl/ast_type.cpp
index cb0852bb77331484e97b1ee52ef996d91d54c97d..49dfde20e97d1408f567fbc3c23d2c551b183d9c 100644 (file)
--- a/src/glsl/ast_type.cpp
+++ b/src/glsl/ast_type.cpp
@@ -23,7 +23,9 @@
 
 #include <cstdio>
 #include "ast.h"
+extern "C" {
 #include "symbol_table.h"
+}
 
 void
 ast_type_specifier::print(void) const

diff --git a/src/glsl/glsl_symbol_table.h b/src/glsl/glsl_symbol_table.h
index ae2fd3f4f1fef7dc592d40f01bdf05bb722c87f5..8fbc66c974d081c07221af6d42c50867124937f6 100644 (file)
--- a/src/glsl/glsl_symbol_table.h
+++ b/src/glsl/glsl_symbol_table.h
@@ -28,7 +28,9 @@
 
 #include <new>
 
+extern "C" {
 #include "symbol_table.h"
+}
 #include "ir.h"
 #include "glsl_types.h"
 

diff --git a/src/glsl/glsl_types.cpp b/src/glsl/glsl_types.cpp
index bef267fa6be5a81ba61699871bdab49fd1fae8f3..9a53fbdbcb402c405e4cf9882afdb9739d65be4c 100644 (file)
--- a/src/glsl/glsl_types.cpp
+++ b/src/glsl/glsl_types.cpp
@@ -27,8 +27,9 @@
 #include "glsl_parser_extras.h"
 #include "glsl_types.h"
 #include "builtin_types.h"
+extern "C" {
 #include "hash_table.h"
-
+}
 
 hash_table *glsl_type::array_types = NULL;
 

diff --git a/src/glsl/ir_clone.cpp b/src/glsl/ir_clone.cpp
index 84176383fca83c1e1d8048db0e8fc8c7e663ba6d..01a1ce3a6d473bb4ef2188ff02f9a113b0c39d2d 100644 (file)
--- a/src/glsl/ir_clone.cpp
+++ b/src/glsl/ir_clone.cpp
@@ -24,7 +24,9 @@
 #include <string.h>
 #include "ir.h"
 #include "glsl_types.h"
+extern "C" {
 #include "hash_table.h"
+}
 
 /**
  * Duplicate an IR variable

diff --git a/src/glsl/ir_function_inlining.cpp b/src/glsl/ir_function_inlining.cpp
index e55780c940eb4a06f4b4c042c58a3a29beab624d..1adf67868ee4b0ef97386202c7ddc6bedca5609f 100644 (file)
--- a/src/glsl/ir_function_inlining.cpp
+++ b/src/glsl/ir_function_inlining.cpp
@@ -33,7 +33,9 @@
 #include "ir_function_inlining.h"
 #include "ir_expression_flattening.h"
 #include "glsl_types.h"
+extern "C" {
 #include "hash_table.h"
+}
 
 class ir_function_inlining_visitor : public ir_hierarchical_visitor {
 public:

diff --git a/src/glsl/ir_validate.cpp b/src/glsl/ir_validate.cpp
index 507e88993f2edf464f9e68f9bb6ec84be24b4a05..1953852487980060bf0666005c5ddec6a1d05bba 100644 (file)
--- a/src/glsl/ir_validate.cpp
+++ b/src/glsl/ir_validate.cpp
@@ -36,7 +36,9 @@
 #include <inttypes.h>
 #include "ir.h"
 #include "ir_hierarchical_visitor.h"
+extern "C" {
 #include "hash_table.h"
+}
 
 static unsigned int hash_func(const void *key)
 {

diff --git a/src/glsl/linker.cpp b/src/glsl/linker.cpp
index ba382fe8816520de7caa97a76a75cfcc0f1dbe1a..8547f74ce65c935beb08f0fb9e10d712610b6adf 100644 (file)
--- a/src/glsl/linker.cpp
+++ b/src/glsl/linker.cpp
@@ -77,7 +77,9 @@ extern "C" {
 #include "ir.h"
 #include "ir_optimization.h"
 #include "program.h"
+extern "C" {
 #include "hash_table.h"
+}
 
 /**
  * Visitor that determines whether or not a variable is ever written.