Index: src/mesa/shader/arbprogparse.c =================================================================== RCS file: /cvs/mesa/Mesa/src/mesa/shader/arbprogparse.c,v retrieving revision 1.57 diff -u -p -r1.57 arbprogparse.c --- src/mesa/shader/arbprogparse.c 25 Apr 2006 00:21:32 -0000 1.57 +++ src/mesa/shader/arbprogparse.c 27 Apr 2006 21:14:29 -0000 @@ -518,7 +518,7 @@ typedef enum */ struct var_cache { - GLubyte *name; + const GLubyte *name; var_type type; GLuint address_binding; /* The index of the address register we should * be using */ @@ -641,7 +641,7 @@ parse_string (GLubyte ** inst, struct va *found = 0; var_cache_create (&va); - va->name = i; + va->name = (const GLubyte *) i; var_cache_append (vc_head, va); @@ -1936,7 +1936,7 @@ parse_param_use (GLcontext * ctx, GLubyt /* First, insert a dummy entry into the var_cache */ var_cache_create (¶m_var); - param_var->name = (GLubyte *) _mesa_strdup (" "); + param_var->name = (const GLubyte *) " "; param_var->type = vt_param; param_var->param_binding_length = 0; @@ -2466,7 +2466,7 @@ parse_src_reg (GLcontext * ctx, GLubyte */ var_cache_create(&src); src->type = vt_attrib; - src->name = (GLubyte *)_mesa_strdup("Dummy Attrib Variable"); + src->name = (const GLubyte *) "Dummy Attrib Variable"; src->attrib_binding = binding; src->attrib_is_generic = is_generic; var_cache_append(vc_head, src);