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/glsl | |
| 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/glsl')
| -rw-r--r-- | src/glsl/glsl_types.h | 6 | ||||
| -rw-r--r-- | src/glsl/ir_uniform.h | 9 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/glsl/glsl_types.h b/src/glsl/glsl_types.h index efbf335066e..4ac90118b86 100644 --- a/src/glsl/glsl_types.h +++ b/src/glsl/glsl_types.h @@ -29,13 +29,13 @@ #include <string.h> #include <assert.h> -struct _mesa_glsl_parse_state; -struct glsl_symbol_table; - #ifdef __cplusplus extern "C" { #endif +struct _mesa_glsl_parse_state; +struct glsl_symbol_table; + extern void _mesa_glsl_initialize_types(struct _mesa_glsl_parse_state *state); diff --git a/src/glsl/ir_uniform.h b/src/glsl/ir_uniform.h index be9f6b25437..225da3fc5ef 100644 --- a/src/glsl/ir_uniform.h +++ b/src/glsl/ir_uniform.h @@ -25,15 +25,18 @@ #ifndef IR_UNIFORM_H #define IR_UNIFORM_H -#ifdef __cplusplus -extern "C" { -#endif /* stdbool.h is necessary because this file is included in both C and C++ code. */ #include <stdbool.h> + #include "program/prog_parameter.h" /* For union gl_constant_value. */ + +#ifdef __cplusplus +extern "C" { +#endif + enum gl_uniform_driver_format { uniform_native = 0, /**< Store data in the native format. */ uniform_int_float, /**< Store integer data as floats. */ |