mesa: include mtypes.h less

[mesa.git] / src / compiler / glsl / glcpp / glcpp.h

diff --git a/src/compiler/glsl/glcpp/glcpp.h b/src/compiler/glsl/glcpp/glcpp.h
index 2804636c30e298839d80027866977a685eb3935c..c7e382ed30c7d34512eb8fbd76af8e31d3693216 100644 (file)
--- a/src/compiler/glsl/glcpp/glcpp.h
+++ b/src/compiler/glsl/glcpp/glcpp.h
@@ -27,12 +27,16 @@
 #include <stdint.h>
 #include <stdbool.h>
 
-#include "main/mtypes.h"
+#include "main/menums.h"
 
 #include "util/ralloc.h"
 
 #include "util/hash_table.h"
 
+#include "util/string_buffer.h"
+
+struct gl_context;
+
 #define yyscan_t void*
 
 /* Some data types used for parser values. */
@@ -199,10 +203,8 @@ struct glcpp_parser {
        int skipping;
        token_list_t *lex_from_list;
        token_node_t *lex_from_node;
-       char *output;
-       char *info_log;
-       size_t output_length;
-       size_t info_log_length;
+       struct _mesa_string_buffer *output;
+       struct _mesa_string_buffer *info_log;
        int error;
        glcpp_extension_iterator extensions;
        const struct gl_extensions *extension_list;