Committing in .

 OpenVMS compile issues

 Modified Files:
 	Mesa-newtree/progs/tests/cva.c
 	Mesa-newtree/progs/tests/dinoshade.c
 	Mesa-newtree/progs/tests/multipal.c
 	Mesa-newtree/src/mesa/main/descrip.mms
 	Mesa-newtree/src/mesa/tnl/descrip.mms
 	Mesa-newtree/src/mesa/tnl/t_vtx_api.c
 ----------------------------------------------------------------------

6 files changed, 34 insertions, 23 deletions

diff --git a/progs/tests/cva.c b/progs/tests/cva.c
index b596a5a4d3e..3f7960f53b6 100644
--- a/progs/tests/cva.c
+++ b/progs/tests/cva.c
@@ -1,4 +1,4 @@
-/* $Id: cva.c,v 1.6 2003/11/23 10:27:10 keithw Exp $ */
+/* $Id: cva.c,v 1.7 2003/12/08 09:03:35 joukj Exp $ */
 
 /*
  * Trivial CVA test, good for testing driver fastpaths (especially
@@ -11,7 +11,11 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include <malloc.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
+#ifdef __VMS
+# include <stddef.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
+#else
+# include <malloc.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
+#endif
 #ifdef _WIN32
 #include <windows.h>
 #endif
diff --git a/progs/tests/dinoshade.c b/progs/tests/dinoshade.c
index 1e4d4abfda8..d0a79c1923f 100644
--- a/progs/tests/dinoshade.c
+++ b/progs/tests/dinoshade.c
@@ -38,7 +38,11 @@
 #include <stdlib.h>
 #include <string.h>
 #include <math.h>       /* for cos(), sin(), and sqrt() */
-#include <malloc.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
+#ifdef __VMS
+# include <stddef.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
+#else
+# include <malloc.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
+#endif
 #ifdef _WIN32
 #include <windows.h>
 #endif
diff --git a/progs/tests/multipal.c b/progs/tests/multipal.c
index 9ac5bdf8df7..c824b38703a 100644
--- a/progs/tests/multipal.c
+++ b/progs/tests/multipal.c
@@ -1,4 +1,4 @@
-/* $Id: multipal.c,v 1.5 2003/11/23 10:27:10 keithw Exp $ */
+/* $Id: multipal.c,v 1.6 2003/12/08 09:03:36 joukj Exp $ */
 
 /*
  * Test multitexture and paletted textures.
@@ -9,7 +9,11 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <malloc.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
+#ifdef __VMS
+# include <stddef.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
+#else
+# include <malloc.h>	/* for ptrdiff_t, referenced by GL.h when GL_GLEXT_LEGACY defined */
+#endif
 #ifdef _WIN32
 #include <windows.h>
 #endif
diff --git a/src/mesa/main/descrip.mms b/src/mesa/main/descrip.mms
index 67d4e2de817..e6d5d22d8c8 100644
--- a/src/mesa/main/descrip.mms
+++ b/src/mesa/main/descrip.mms
@@ -17,6 +17,7 @@ LIBDIR = [---.lib]
 CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
 
 SOURCES =accum.c \
+	api_arrayelt.c \
 	api_loopback.c \
 	api_noop.c \
 	api_validate.c \
@@ -75,6 +76,7 @@ SOURCES =accum.c \
 	vtxfmt.c
 
 OBJECTS=accum.obj,\
+api_arrayelt.obj,\
 api_loopback.obj,\
 api_noop.obj,\
 api_validate.obj,\
@@ -147,6 +149,7 @@ clean :
 	delete *.obj;*
 
 accum.obj : accum.c
+api_arrayelt.obj : api_arrayelt.c
 api_loopback.obj : api_loopback.c
 api_noop.obj : api_noop.c
 api_validate.obj : api_validate.c
diff --git a/src/mesa/tnl/descrip.mms b/src/mesa/tnl/descrip.mms
index 8826d049a42..c00fc5ac54f 100644
--- a/src/mesa/tnl/descrip.mms
+++ b/src/mesa/tnl/descrip.mms
@@ -17,18 +17,17 @@ INCDIR = [---.include],[-.main],[-.glapi]
 LIBDIR = [---.lib]
 CFLAGS = /include=($(INCDIR),[])/define=(PTHREADS=1)/name=(as_is,short)
 
-SOURCES = t_array_api.c t_array_import.c t_context.c t_eval_api.c \
-	t_imm_alloc.c t_imm_api.c t_imm_debug.c t_imm_dlist.c t_imm_elt.c \
-	t_imm_eval.c t_imm_exec.c t_imm_fixup.c t_pipeline.c t_vb_fog.c \
+SOURCES = t_array_api.c t_array_import.c t_context.c \
+	t_pipeline.c t_vb_fog.c t_save_api.c t_vtx_api.c \
 	t_vb_light.c t_vb_normals.c t_vb_points.c t_vb_program.c \
-	t_vb_render.c t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c
+	t_vb_render.c t_vb_texgen.c t_vb_texmat.c t_vb_vertex.c \
+	t_vtx_eval.c t_vtx_exec.c t_save_playback.c t_save_loopback.c
 
-OBJECTS = t_array_api.obj,t_array_import.obj,t_context.obj,t_eval_api.obj,\
-	t_imm_alloc.obj,t_imm_api.obj,t_imm_debug.obj,t_imm_dlist.obj,\
-	t_imm_elt.obj,t_imm_eval.obj,t_imm_exec.obj,t_imm_fixup.obj,\
+OBJECTS = t_array_api.obj,t_array_import.obj,t_context.obj,\
 	t_pipeline.obj,t_vb_fog.obj,t_vb_light.obj,t_vb_normals.obj,\
 	t_vb_points.obj,t_vb_program.obj,t_vb_render.obj,t_vb_texgen.obj,\
-	t_vb_texmat.obj,t_vb_vertex.obj
+	t_vb_texmat.obj,t_vb_vertex.obj,t_save_api.obj,t_vtx_api.obj,\
+	t_vtx_eval.obj,t_vtx_exec.obj,t_save_playback.obj,t_save_loopback.obj
 
 ##### RULES #####
 
@@ -46,15 +45,6 @@ clean :
 t_array_api.obj : t_array_api.c
 t_array_import.obj : t_array_import.c
 t_context.obj : t_context.c
-t_eval_api.obj : t_eval_api.c
-t_imm_alloc.obj : t_imm_alloc.c
-t_imm_api.obj : t_imm_api.c
-t_imm_debug.obj : t_imm_debug.c
-t_imm_dlist.obj : t_imm_dlist.c
-t_imm_elt.obj : t_imm_elt.c
-t_imm_eval.obj : t_imm_eval.c
-t_imm_exec.obj : t_imm_exec.c
-t_imm_fixup.obj : t_imm_fixup.c
 t_pipeline.obj : t_pipeline.c
 t_vb_fog.obj : t_vb_fog.c
 t_vb_light.obj : t_vb_light.c
@@ -65,3 +55,9 @@ t_vb_render.obj : t_vb_render.c
 t_vb_texgen.obj : t_vb_texgen.c
 t_vb_texmat.obj : t_vb_texmat.c
 t_vb_vertex.obj : t_vb_vertex.c
+t_save_api.obj : t_save_api.c
+t_vtx_api.obj : t_vtx_api.c
+t_vtx_eval.obj : t_vtx_eval.c
+t_vtx_exec.obj : t_vtx_exec.c
+t_save_playback.obj : t_save_playback.c
+t_save_loopback.obj : t_save_loopback.c
diff --git a/src/mesa/tnl/t_vtx_api.c b/src/mesa/tnl/t_vtx_api.c
index 8f105bef89e..2fd5ccab1f3 100644
--- a/src/mesa/tnl/t_vtx_api.c
+++ b/src/mesa/tnl/t_vtx_api.c
@@ -431,7 +431,7 @@ ATTRS( 15 )
 
 static void init_attrfv( TNLcontext *tnl )
 {
-#ifdef WIN32
+#if defined( WIN32 ) || defined( __VMS )
    if (0) fprintf(stderr, "%s %d\n", "init_attrfv", tnl->vtx.vertex_size);
 #else
    if (0) fprintf(stderr, "%s %d\n", __FUNCTION__, tnl->vtx.vertex_size);