The shaderapi.h header already has the extern "C" wrapper. --- src/mesa/main/shader_query.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/mesa/main/shader_query.cpp b/src/mesa/main/shader_query.cpp index b6d3677..16b43e8 100644 --- a/src/mesa/main/shader_query.cpp +++ b/src/mesa/main/shader_query.cpp @@ -32,6 +32,7 @@ #include "main/core.h" #include "glsl_symbol_table.h" #include "ir.h" +#include "shaderapi.h" #include "shaderobj.h" #include "program/hash_table.h" #include "../glsl/program.h" @@ -39,9 +40,6 @@ #include "main/enums.h" #include "util/strndup.h" -extern "C" { -#include "shaderapi.h" -} static GLint program_resource_location(struct gl_shader_program *shProg, -- 1.9.1 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev