aboutsummaryrefslogtreecommitdiffstats
path: root/src/glsl/glcpp/pp.c
diff options
context:
space:
mode:
authorDave Airlie <[email protected]>2012-09-14 10:13:01 +1000
committerDave Airlie <[email protected]>2012-09-15 08:22:55 +1000
commit88b0790b1ae8864d4ec6196b3939498bbffdbb5f (patch)
tree4de2b64235ad51a222889298fa7dcd1d1d3994c0 /src/glsl/glcpp/pp.c
parent53d46bc787318ccf9911fdd1d5fe99ee4db7f41a (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/glcpp/pp.c')
-rw-r--r--src/glsl/glcpp/pp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/glsl/glcpp/pp.c b/src/glsl/glcpp/pp.c
index 9170d14a304..11b29417be2 100644
--- a/src/glsl/glcpp/pp.c
+++ b/src/glsl/glcpp/pp.c
@@ -150,7 +150,7 @@ remove_line_continuations(glcpp_parser_t *ctx, const char *shader)
}
int
-preprocess(void *ralloc_ctx, const char **shader, char **info_log,
+glcpp_preprocess(void *ralloc_ctx, const char **shader, char **info_log,
const struct gl_extensions *extensions, int api)
{
int errors;