Committing in .

 VMS & type-mismatch problems

 Modified Files:
 	Mesa/include/GL/glext.h Mesa/include/GL/glx.h
 ----------------------------------------------------------------------

diff --git a/include/GL/glext.h b/include/GL/glext.h
index 934c7f6755cb05d553cf700a07ba50595e52e3bd..588994774c7db8d1a35ecc3829515fdf5d1f285e 100644 (file)
--- a/include/GL/glext.h
+++ b/include/GL/glext.h
@@ -1250,6 +1250,14 @@ GLAPI void APIENTRY glGetCombinerInputParameterfvNV(GLenum stage, GLenum portion
 
 GLAPI void APIENTRY glGetCombinerInputParameterivNV(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint * params);
 
+#ifdef VMS
+/*VMS only allows externals of maximal 31 characters! */
+# define glGetCombinerOutputParameterfvNV glGetCombinerOutputParameterfvN
+#define glGetCombinerOutputParameterivNV glGetCombinerOutputParameterivN
+#define glGetFinalCombinerInputParameterfvNV glGetFnlCmbinerInpParameterfvNV
+#define glGetFinalCombinerInputParameterivNV glGetFnlCmbinerInpParameterivNV
+#endif
+
 GLAPI void APIENTRY glGetCombinerOutputParameterfvNV(GLenum stage, GLenum portion, GLenum pname, GLfloat * params);
 
 GLAPI void APIENTRY glGetCombinerOutputParameterivNV(GLenum stage, GLenum portion, GLenum pname, GLint * params);
@@ -1257,7 +1265,6 @@ GLAPI void APIENTRY glGetCombinerOutputParameterivNV(GLenum stage, GLenum portio
 GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV(GLenum variable, GLenum pname, GLfloat * params);
 
 GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV(GLenum variable, GLenum pname, GLint * params);
-
 #endif /* GL_NV_register_combiners */
 
 

diff --git a/include/GL/glx.h b/include/GL/glx.h
index d54a6684f644f3f1ef3afafad741f916623de2b5..d770fb989e84fcb1c832de4a64f6a44b2a223c92 100644 (file)
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,4 +1,4 @@
-/* $Id: glx.h,v 1.11 2000/02/23 23:04:27 brianp Exp $ */
+/* $Id: glx.h,v 1.12 2000/02/25 12:35:57 joukj Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -225,7 +225,7 @@ extern Bool glXMakeCurrent( Display *dpy, GLXDrawable drawable,
                            GLXContext ctx);
 
 extern void glXCopyContext( Display *dpy, GLXContext src, GLXContext dst,
-                           unsigned long mask );
+                           GLuint mask );
 
 extern void glXSwapBuffers( Display *dpy, GLXDrawable drawable );