diff options
author | José Fonseca <[email protected]> | 2011-11-09 10:20:51 +0000 |
---|---|---|
committer | José Fonseca <[email protected]> | 2011-11-09 10:24:37 +0000 |
commit | 63e7a4c6e5bf51d8090046ebc5adcb4207448565 (patch) | |
tree | b701753960e53fe36889273def9d28e0059445d6 /src/mesa/main/uniforms.h | |
parent | f4b42aa5b7a3d11f839d5576b4c42406529131be (diff) |
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/uniforms.h')
-rw-r--r-- | src/mesa/main/uniforms.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/mesa/main/uniforms.h b/src/mesa/main/uniforms.h index c73aab3c1d5..123d7b95423 100644 --- a/src/mesa/main/uniforms.h +++ b/src/mesa/main/uniforms.h @@ -30,6 +30,11 @@ #include "../glsl/glsl_types.h" #include "../glsl/ir_uniform.h" +#ifdef __cplusplus +extern "C" { +#endif + + struct gl_program; struct _glapi_table; @@ -281,4 +286,10 @@ _mesa_uniform_split_location_offset(GLint location, unsigned *base_location, } /*@}*/ + +#ifdef __cplusplus +} +#endif + + #endif /* UNIFORMS_H */ |