diff options
author | marha <marha@users.sourceforge.net> | 2011-02-01 10:02:38 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-02-01 10:02:38 +0000 |
commit | 0bf07d32cbd460220c67d726900772cf3692746d (patch) | |
tree | ba6b1e1937e42744591715078444891d4ade5b1e /mesalib/src/glsl/glcpp/glcpp.h | |
parent | cacf23d832a26e35851c9cc666304ac72cf8fe34 (diff) | |
download | vcxsrv-0bf07d32cbd460220c67d726900772cf3692746d.tar.gz vcxsrv-0bf07d32cbd460220c67d726900772cf3692746d.tar.bz2 vcxsrv-0bf07d32cbd460220c67d726900772cf3692746d.zip |
libX11 libXinerama mesa git update 1 Feb 2011
Diffstat (limited to 'mesalib/src/glsl/glcpp/glcpp.h')
-rw-r--r-- | mesalib/src/glsl/glcpp/glcpp.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mesalib/src/glsl/glcpp/glcpp.h b/mesalib/src/glsl/glcpp/glcpp.h index 7125d325d..dc816e90e 100644 --- a/mesalib/src/glsl/glcpp/glcpp.h +++ b/mesalib/src/glsl/glcpp/glcpp.h @@ -26,7 +26,7 @@ #include <stdint.h> -#include <talloc.h> +#include "../ralloc.h" #include "program/hash_table.h" @@ -189,7 +189,7 @@ void glcpp_parser_destroy (glcpp_parser_t *parser); int -preprocess(void *talloc_ctx, const char **shader, char **info_log, +preprocess(void *ralloc_ctx, const char **shader, char **info_log, const struct gl_extensions *extensions, int api); /* Functions for writing to the info log */ |