diff options
| author | marha <marha@users.sourceforge.net> | 2011-02-01 10:46:14 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-02-01 10:46:14 +0000 |
| commit | d4a8565009962e162d86a9c4ae24062a3fa12025 (patch) | |
| tree | bcd249c3c523b23a6350b1d6b5a2cff7518cdb0e /mesalib/src/glsl/glcpp/glcpp.h | |
| parent | 6751d9898be671d253d6f7b0806cd4b10daaaf85 (diff) | |
| parent | 0bf07d32cbd460220c67d726900772cf3692746d (diff) | |
| download | vcxsrv-d4a8565009962e162d86a9c4ae24062a3fa12025.tar.gz vcxsrv-d4a8565009962e162d86a9c4ae24062a3fa12025.tar.bz2 vcxsrv-d4a8565009962e162d86a9c4ae24062a3fa12025.zip | |
svn merge ^/branches/released .
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 */ |