Some structure renaming.  Prefix vertex/fragment-related structs with
"gl_" to match other structs.
diff --git a/src/mesa/shader/arbprogparse.c b/src/mesa/shader/arbprogparse.c
index 12db646..39e7457 100644
--- a/src/mesa/shader/arbprogparse.c
+++ b/src/mesa/shader/arbprogparse.c
@@ -51,7 +51,7 @@
  */
 struct arb_program
 {
-   struct program Base;
+   struct gl_program Base;
 
    GLuint Position;       /* Just used for error reporting while parsing */
    GLuint MajorVersion;
@@ -4060,7 +4060,7 @@
 void
 _mesa_parse_arb_fragment_program(GLcontext* ctx, GLenum target,
                                  const GLvoid *str, GLsizei len,
-                                 struct fragment_program *program)
+                                 struct gl_fragment_program *program)
 {
    struct arb_program ap;
    GLuint i;
@@ -4115,7 +4115,7 @@
 void
 _mesa_parse_arb_vertex_program(GLcontext *ctx, GLenum target,
 			       const GLvoid *str, GLsizei len,
-			       struct vertex_program *program)
+			       struct gl_vertex_program *program)
 {
    struct arb_program ap;