Merge head into branchvtx-0-2-24112003vtx-0-2-branch

5 files changed, 19 insertions, 3 deletions

diff --git a/include/GL/fxmesa.h b/include/GL/fxmesa.h
index 24c38278f5..fd3dbaeac5 100644
--- a/include/GL/fxmesa.h
+++ b/include/GL/fxmesa.h
@@ -22,7 +22,7 @@
 /*
  * FXMesa - 3Dfx Glide driver for Mesa.  Contributed by David Bucciarelli
  *
- * NOTE: This version requires Glide 2.3 or later.
+ * NOTE: This version requires Glide3 (http://sourceforge.net/projects/glide)
  */
 
 
diff --git a/include/GL/gl.h b/include/GL/gl.h
index a3179cf257..e2dbeb3e93 100644
--- a/include/GL/gl.h
+++ b/include/GL/gl.h
@@ -2261,6 +2261,16 @@ typedef void (APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC)(GLuint id, GLenum pname,
 #endif /* GL_ARB_occlusion_query */
 
 
+/* XXX temporary until glext.h is updated! */
+#ifndef GL_ARB_point_sprite
+#define GL_ARB_point_sprite 1
+
+#define GL_POINT_SPRITE_ARB                0x8861
+#define GL_COORD_REPLACE_ARB               0x8862
+
+#endif /* GL_ARB_point_sprite */
+
+
 #ifndef GL_MESA_program_debug
 #define GL_MESA_program_debug 1
 
diff --git a/include/GL/glu.h b/include/GL/glu.h
index 5eaa554748..99515dcc37 100644
--- a/include/GL/glu.h
+++ b/include/GL/glu.h
@@ -40,6 +40,10 @@
 #define GLAPIENTRY
 #endif
 
+#ifndef GLAPIENTRYP
+#define GLAPIENTRYP GLAPIENTRY *
+#endif
+
 #ifndef GLAPI
 #define GLAPI
 #endif
@@ -266,7 +270,7 @@ typedef GLUtesselator GLUtriangulatorObj;
 #define GLU_TESS_MAX_COORD 1.0e150
 
 /* Internal convenience typedefs */
-typedef void (GLAPIENTRY *_GLUfuncptr)();
+typedef void (GLAPIENTRYP _GLUfuncptr)();
 
 GLAPI void GLAPIENTRY gluBeginCurve (GLUnurbs* nurb);
 GLAPI void GLAPIENTRY gluBeginPolygon (GLUtesselator* tess);
diff --git a/include/GL/glu_mangle.h b/include/GL/glu_mangle.h
index 4cc9b6f044..9c25aa864c 100644
--- a/include/GL/glu_mangle.h
+++ b/include/GL/glu_mangle.h
@@ -80,5 +80,7 @@
 #define gluBuild3DMipmaps mgluBuild3DMipmaps
 #define gluCheckExtension mgluCheckExtension
 #define gluUnProject4 mgluUnProject4
+#define gluNurbsCallbackData mgluNurbsCallbackData
+#define gluNurbsCallbackDataEXT mgluNurbsCallbackDataEXT
 
 #endif
diff --git a/include/GL/glut.h b/include/GL/glut.h
index 27d937f7ce..3a67f1f560 100644
--- a/include/GL/glut.h
+++ b/include/GL/glut.h
@@ -648,7 +648,7 @@ GLUTAPI void GLUTAPIENTRY glutJoystickFunc(void (GLUTCALLBACK *func)(unsigned in
 #endif
 
 /* GLUT color index sub-API. */
-GLUTAPI void GLUTAPIENTRY glutSetColor(int, GLfloat red, GLfloat green, GLfloat blue);
+GLUTAPI void GLUTAPIENTRY glutSetColor(int ndx, GLfloat red, GLfloat green, GLfloat blue);
 GLUTAPI GLfloat GLUTAPIENTRY glutGetColor(int ndx, int component);
 GLUTAPI void GLUTAPIENTRY glutCopyColormap(int win);