4 files changed, 13 insertions, 8 deletions
diff --git a/src/glu/sgi/libnurbs/nurbtess/monoChain.cc b/src/glu/sgi/libnurbs/nurbtess/monoChain.cc
index f7b042c369..f3321ddab3 100644
--- a/src/glu/sgi/libnurbs/nurbtess/monoChain.cc
+++ b/src/glu/sgi/libnurbs/nurbtess/monoChain.cc
@@ -31,10 +31,10 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
+** $Date: 2004/05/12 15:29:36 $ $Revision: 1.2 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/monoChain.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $
+** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/monoChain.cc,v 1.2 2004/05/12 15:29:36 brianp Exp $
 */
 
 #include "gluos.h"
@@ -63,7 +63,7 @@ extern Int deleteRepeatDiagonals(Int num_diagonals, directedLine** diagonal_vert
 //for debug purpose only
 static void drawDiagonals(Int num_diagonals, directedLine** diagonal_vertices)
 {
-  Int i,k;
+  Int i;
   for(i=0; i<num_diagonals; i++)
     {
       glBegin(GL_LINE);
diff --git a/src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc b/src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc
index 385d72a80b..e7e19437b1 100644
--- a/src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc
+++ b/src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc
@@ -31,10 +31,10 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2001/03/22 11:41:40 $ $Revision: 1.2 $
+** $Date: 2004/05/12 15:29:36 $ $Revision: 1.3 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc,v 1.2 2001/03/22 11:41:40 joukj Exp $
+** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/monoTriangulation.cc,v 1.3 2004/05/12 15:29:36 brianp Exp $
 */
 
 #include <stdlib.h>
@@ -740,8 +740,10 @@ void monoTriangulationRecFunGen(Real* topVertex, Real* botVertex,
   assert( inc_chain != NULL && dec_chain != NULL);
   assert( ! (inc_current> inc_end &&
 	     dec_current> dec_end));
+  /*
   Int inc_nVertices;
   Int dec_nVertices;
+  */
   Real** inc_array ;
   Real** dec_array ;
   Int i;
diff --git a/src/glu/sgi/libnurbs/nurbtess/polyDBG.cc b/src/glu/sgi/libnurbs/nurbtess/polyDBG.cc
index ce38666dca..291ade8216 100644
--- a/src/glu/sgi/libnurbs/nurbtess/polyDBG.cc
+++ b/src/glu/sgi/libnurbs/nurbtess/polyDBG.cc
@@ -719,7 +719,6 @@ sampledLine*  DBG_collectSampledLinesAllPoly(directedLine *polygonList)
 void  DBG_collectSampledLinesPoly(directedLine *polygon, sampledLine*& retHead, sampledLine*& retTail)
 {
   directedLine *temp;
-  sampledLine *ret = NULL;
   retHead = NULL;
   retTail = NULL;
   if(polygon == NULL)
diff --git a/src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc b/src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc
index 4024397ae6..6bf01ce025 100644
--- a/src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc
+++ b/src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc
@@ -31,10 +31,10 @@
 ** published by SGI, but has not been independently verified as being
 ** compliant with the OpenGL(R) version 1.2.1 Specification.
 **
-** $Date: 2002/11/08 17:38:13 $ $Revision: 1.3 $
+** $Date: 2004/05/12 15:29:36 $ $Revision: 1.4 $
 */
 /*
-** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc,v 1.3 2002/11/08 17:38:13 brianp Exp $
+** $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/sampleMonoPoly.cc,v 1.4 2004/05/12 15:29:36 brianp Exp $
 */
 
 #include "gluos.h"
@@ -980,8 +980,10 @@ void findLeftGridIndices(directedLine* topEdge, Int firstGridIndex, Int lastGrid
   Int n_ulines = grid->get_n_ulines();
   Real uMin = grid->get_u_min();
   Real uMax = grid->get_u_max();
+  /*
   Real vMin = grid->get_v_min();
   Real vMax = grid->get_v_max();
+  */
   Real slop, uinterc;
 
 #ifdef SHORTEN_GRID_LINE
@@ -1096,8 +1098,10 @@ void findRightGridIndices(directedLine* topEdge, Int firstGridIndex, Int lastGri
   Int n_ulines = grid->get_n_ulines();
   Real uMin = grid->get_u_min();
   Real uMax = grid->get_u_max();
+  /*
   Real vMin = grid->get_v_min();
   Real vMax = grid->get_v_max();
+  */
   Real slop, uinterc;
 
 #ifdef SHORTEN_GRID_LINE