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

This commit is contained in:
Eric Anholt
2010-06-24 17:08:53 -07:00
parent f4869f3326
commit 3d6012303c
7 changed files with 14 additions and 1 deletions

View File

@@ -23,7 +23,9 @@
#include <cstdio> #include <cstdio>
#include "ast.h" #include "ast.h"
extern "C" {
#include "symbol_table.h" #include "symbol_table.h"
}
void void
ast_type_specifier::print(void) const ast_type_specifier::print(void) const

View File

@@ -28,7 +28,9 @@
#include <new> #include <new>
extern "C" {
#include "symbol_table.h" #include "symbol_table.h"
}
#include "ir.h" #include "ir.h"
#include "glsl_types.h" #include "glsl_types.h"

View File

@@ -27,8 +27,9 @@
#include "glsl_parser_extras.h" #include "glsl_parser_extras.h"
#include "glsl_types.h" #include "glsl_types.h"
#include "builtin_types.h" #include "builtin_types.h"
extern "C" {
#include "hash_table.h" #include "hash_table.h"
}
hash_table *glsl_type::array_types = NULL; hash_table *glsl_type::array_types = NULL;

View File

@@ -24,7 +24,9 @@
#include <string.h> #include <string.h>
#include "ir.h" #include "ir.h"
#include "glsl_types.h" #include "glsl_types.h"
extern "C" {
#include "hash_table.h" #include "hash_table.h"
}
/** /**
* Duplicate an IR variable * Duplicate an IR variable

View File

@@ -33,7 +33,9 @@
#include "ir_function_inlining.h" #include "ir_function_inlining.h"
#include "ir_expression_flattening.h" #include "ir_expression_flattening.h"
#include "glsl_types.h" #include "glsl_types.h"
extern "C" {
#include "hash_table.h" #include "hash_table.h"
}
class ir_function_inlining_visitor : public ir_hierarchical_visitor { class ir_function_inlining_visitor : public ir_hierarchical_visitor {
public: public:

View File

@@ -36,7 +36,9 @@
#include <inttypes.h> #include <inttypes.h>
#include "ir.h" #include "ir.h"
#include "ir_hierarchical_visitor.h" #include "ir_hierarchical_visitor.h"
extern "C" {
#include "hash_table.h" #include "hash_table.h"
}
static unsigned int hash_func(const void *key) static unsigned int hash_func(const void *key)
{ {

View File

@@ -77,7 +77,9 @@ extern "C" {
#include "ir.h" #include "ir.h"
#include "ir_optimization.h" #include "ir_optimization.h"
#include "program.h" #include "program.h"
extern "C" {
#include "hash_table.h" #include "hash_table.h"
}
/** /**
* Visitor that determines whether or not a variable is ever written. * Visitor that determines whether or not a variable is ever written.