summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/shaderapi.h
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2011-11-09 10:20:51 +0000
committerJosé Fonseca <jfonseca@vmware.com>2011-11-09 10:24:37 +0000
commit63e7a4c6e5bf51d8090046ebc5adcb4207448565 (patch)
treeb701753960e53fe36889273def9d28e0059445d6 /src/mesa/main/shaderapi.h
parentf4b42aa5b7a3d11f839d5576b4c42406529131be (diff)
downloadexternal_mesa3d-63e7a4c6e5bf51d8090046ebc5adcb4207448565.zip
external_mesa3d-63e7a4c6e5bf51d8090046ebc5adcb4207448565.tar.gz
external_mesa3d-63e7a4c6e5bf51d8090046ebc5adcb4207448565.tar.bz2
mesa,glsl,mapi: Put extern "C" { ... } where appropriate.
Probably a several places missing, but enough to cover all headers (in)directly included by uniform_query.cpp, and fix the MSVC build.
Diffstat (limited to 'src/mesa/main/shaderapi.h')
-rw-r--r--src/mesa/main/shaderapi.h11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/mesa/main/shaderapi.h b/src/mesa/main/shaderapi.h
index bec448d..0ffebdb 100644
--- a/src/mesa/main/shaderapi.h
+++ b/src/mesa/main/shaderapi.h
@@ -29,6 +29,12 @@
#include "glheader.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
struct _glapi_table;
struct gl_context;
struct gl_shader_program;
@@ -194,4 +200,9 @@ _mesa_ActiveProgramEXT(GLuint program);
extern GLuint GLAPIENTRY
_mesa_CreateShaderProgramEXT(GLenum type, const GLchar *string);
+
+#ifdef __cplusplus
+}
+#endif
+
#endif /* SHADERAPI_H */