diff options
| author | Dave Airlie <[email protected]> | 2012-09-14 10:13:01 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2012-09-15 08:22:55 +1000 |
| commit | 88b0790b1ae8864d4ec6196b3939498bbffdbb5f (patch) | |
| tree | 4de2b64235ad51a222889298fa7dcd1d1d3994c0 /src/glsl/glsl_parser_extras.h | |
| parent | 53d46bc787318ccf9911fdd1d5fe99ee4db7f41a (diff) | |
mesa/glsl: rename preprocess to glcpp_preprocess
This symbol with dricore escapes into the namespace, its too generic,
we should prefix it with something just to be nice.
Should be applied to stable + 9.0
Acked-by: Kenneth Graunke <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
Diffstat (limited to 'src/glsl/glsl_parser_extras.h')
| -rw-r--r-- | src/glsl/glsl_parser_extras.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glsl_parser_extras.h b/src/glsl/glsl_parser_extras.h index fc08ee273aa..c8c40ab5a71 100644 --- a/src/glsl/glsl_parser_extras.h +++ b/src/glsl/glsl_parser_extras.h @@ -296,7 +296,7 @@ _mesa_glsl_shader_target_name(enum _mesa_glsl_parser_targets target); extern "C" { #endif -extern int preprocess(void *ctx, const char **shader, char **info_log, +extern int glcpp_preprocess(void *ctx, const char **shader, char **info_log, const struct gl_extensions *extensions, int api); extern void _mesa_destroy_shader_compiler(void); |