fixes to make old GLU code compile with new GLU 1.3 header

3 files changed, 12 insertions, 10 deletions

diff --git a/src/glu/mesa/glu.c b/src/glu/mesa/glu.c
index d7d8b93bdb..7cc5fab156 100644
--- a/src/glu/mesa/glu.c
+++ b/src/glu/mesa/glu.c
@@ -1,4 +1,4 @@
-/* $Id: glu.c,v 1.23 2001/01/30 18:08:51 brianp Exp $ */
+/* $Id: glu.c,v 1.24 2001/03/20 17:56:10 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -43,7 +43,9 @@
 #endif
 #define EPS 0.00001
 
-
+#ifndef GLU_INCOMPATIBLE_GL_VERSION
+#define GLU_INCOMPATIBLE_GL_VERSION     100903
+#endif
 
 
 void GLAPIENTRY
@@ -181,7 +183,7 @@ gluPerspective(GLdouble fovy, GLdouble aspect, GLdouble zNear, GLdouble zFar)
 
 void GLAPIENTRY
 gluPickMatrix(GLdouble x, GLdouble y,
-	      GLdouble width, GLdouble height, const GLint viewport[4])
+	      GLdouble width, GLdouble height, GLint viewport[4])
 {
    GLfloat m[16];
    GLfloat sx, sy;
@@ -392,16 +394,16 @@ void (GLAPIENTRY * gluGetProcAddressEXT(const GLubyte * procName)) ()
  */
 #ifdef GLU_VERSION_1_3
 GLboolean GLAPIENTRY
-gluCheckExtension(const char *extName, const GLubyte * extString)
+gluCheckExtension(const GLubyte *extName, const GLubyte * extString)
 {
    assert(extName);
    assert(extString);
    {
-      const int len = strlen(extName);
+      const int len = strlen((const char *) extName);
       const char *start = (const char *) extString;
 
       while (1) {
-	 const char *c = strstr(start, extName);
+	 const char *c = strstr(start, (const char *) extName);
 	 if (!c)
 	    return GL_FALSE;
 
diff --git a/src/glu/mesa/tess.c b/src/glu/mesa/tess.c
index 7e05dbb0d0..2725914d33 100644
--- a/src/glu/mesa/tess.c
+++ b/src/glu/mesa/tess.c
@@ -1,4 +1,4 @@
-/* $Id: tess.c,v 1.25 2000/07/11 14:11:04 brianp Exp $ */
+/* $Id: tess.c,v 1.26 2001/03/20 17:56:10 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -80,7 +80,7 @@ gluNewTess(void)
    GLUtriangulatorObj *tobj;
 
    if ((tobj = (GLUtriangulatorObj *)
-	malloc(sizeof(struct GLUtriangulatorObj))) == NULL)
+	malloc(sizeof(struct GLUtesselator))) == NULL)
       return NULL;
    tobj->contours = tobj->last_contour = NULL;
    init_callbacks(&tobj->callbacks);
diff --git a/src/glu/mesa/tess.h b/src/glu/mesa/tess.h
index ddb9b30cb2..8fb7a414d4 100644
--- a/src/glu/mesa/tess.h
+++ b/src/glu/mesa/tess.h
@@ -1,4 +1,4 @@
-/* $Id: tess.h,v 1.17 2000/07/11 14:11:04 brianp Exp $ */
+/* $Id: tess.h,v 1.18 2001/03/20 17:56:10 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -85,7 +85,7 @@ typedef struct polygon_str
 }
 tess_polygon;
 
-struct GLUtriangulatorObj
+struct GLUtesselator
 {
    tess_contour *contours, *last_contour;
    GLuint contour_cnt;