Index: src/glu/sgi/libnurbs/interface/mystdio.h
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/interface/mystdio.h,v
retrieving revision 1.3
diff -u -b -B -u -r1.3 mystdio.h
--- src/glu/sgi/libnurbs/interface/mystdio.h	19 Mar 2001 17:52:02 -0000	1.3
+++ src/glu/sgi/libnurbs/interface/mystdio.h	13 Mar 2006 03:04:10 -0000
@@ -43,20 +43,20 @@
 #define __glumystdio_h_
 
 #ifdef STANDALONE
-inline void dprintf( char *, ... ) { }
+inline void __mesa_dprintf( char *, ... ) { }
 #endif
 
 #ifdef LIBRARYBUILD
 #ifndef NDEBUG
 #include <stdio.h>
-#define dprintf printf
+#define __mesa_dprintf printf
 #else
-inline void dprintf( char *, ... ) { }
+inline void __mesa_dprintf( char *, ... ) { }
 #endif
 #endif
 
 #ifdef GLBUILD
-inline void dprintf( char *, ... ) { }
+inline void __mesa_dprintf( char *, ... ) { }
 #endif
 
 #ifndef NULL
Index: src/glu/sgi/libnurbs/internals/arc.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/arc.cc,v
retrieving revision 1.4
diff -u -b -B -u -r1.4 arc.cc
--- src/glu/sgi/libnurbs/internals/arc.cc	24 Nov 2003 15:19:27 -0000	1.4
+++ src/glu/sgi/libnurbs/internals/arc.cc	13 Mar 2006 03:04:10 -0000
@@ -156,9 +156,9 @@
 Arc::show()
 {
 #ifndef NDEBUG
-    dprintf( "\tPWLARC NP: %d FL: 1\n", pwlArc->npts );
+    __mesa_dprintf( "\tPWLARC NP: %d FL: 1\n", pwlArc->npts );
     for( int i = 0; i < pwlArc->npts; i++ ) {
-	 dprintf( "\t\tVERTEX %f %f\n", pwlArc->pts[i].param[0],
+	 __mesa_dprintf( "\t\tVERTEX %f %f\n", pwlArc->pts[i].param[0],
 			pwlArc->pts[i].param[1] );
     }
 #endif
@@ -175,14 +175,14 @@
     Arc_ptr jarc = this;
 
 #ifndef NDEBUG
-    dprintf( "BGNTRIM\n" );
+    __mesa_dprintf( "BGNTRIM\n" );
 #endif
     do {
 	jarc->show( );
 	jarc = jarc->next;
     } while (jarc != this);
 #ifndef NDEBUG
-    dprintf("ENDTRIM\n" );
+    __mesa_dprintf("ENDTRIM\n" );
 #endif
 }
 
@@ -203,8 +203,8 @@
     if( ((p0[0] - p1[0]) > ZERO) || ((p1[0] - p0[0]) > ZERO) ||
 	((p0[1] - p1[1]) > ZERO) || ((p1[1] - p0[1]) > ZERO)  ) {
 #ifndef NDEBUG
-	dprintf( "x coord = %f %f %f\n", p0[0], p1[0], p0[0] - p1[0] );
-	dprintf( "y coord = %f %f %f\n", p0[1], p1[1], p0[1] - p1[1] );
+	__mesa_dprintf( "x coord = %f %f %f\n", p0[0], p1[0], p0[0] - p1[0] );
+	__mesa_dprintf( "y coord = %f %f %f\n", p0[1], p1[1], p0[1] - p1[1] );
 #endif
 	return 1;
     } else {
@@ -244,7 +244,7 @@
 
 	if (jarc->prev == 0 || jarc->next == 0) {
 #ifndef NDEBUG
-	    dprintf( "checkjarc:null next/prev pointer\n");
+	    __mesa_dprintf( "checkjarc:null next/prev pointer\n");
 	    jarc->print( );
 #endif
 	    return 0;
@@ -252,7 +252,7 @@
 
 	if (jarc->next->prev != jarc) {
 #ifndef NDEBUG
-	    dprintf( "checkjarc: pointer linkage screwed up\n");
+	    __mesa_dprintf( "checkjarc: pointer linkage screwed up\n");
 	    jarc->print( );
 #endif
 	    return 0;
@@ -271,7 +271,7 @@
 	    if( jarc->prev->pwlArc ) {
 		if( jarc->tail()[1] != jarc->prev->rhead()[1] ) {
 #ifndef NDEBUG
-		    dprintf( "checkjarc: geometric linkage screwed up 1\n");
+		    __mesa_dprintf( "checkjarc: geometric linkage screwed up 1\n");
 		    jarc->prev->show();
 		    jarc->show();
 #endif
@@ -280,7 +280,7 @@
 		if( jarc->tail()[0] != jarc->prev->rhead()[0] ) {
 	        
 #ifndef NDEBUG
-		    dprintf( "checkjarc: geometric linkage screwed up 2\n");
+		    __mesa_dprintf( "checkjarc: geometric linkage screwed up 2\n");
 		    jarc->prev->show();
 		    jarc->show();
 #endif
@@ -290,7 +290,7 @@
 	    if( jarc->next->pwlArc ) {
 		if( jarc->next->tail()[0] != jarc->rhead()[0] ) {
 #ifndef NDEBUG
-			dprintf( "checkjarc: geometric linkage screwed up 3\n");
+			__mesa_dprintf( "checkjarc: geometric linkage screwed up 3\n");
 			jarc->show();
 			jarc->next->show();
 #endif
@@ -298,7 +298,7 @@
 		}
 		if( jarc->next->tail()[1] != jarc->rhead()[1] ) {
 #ifndef NDEBUG
-			dprintf( "checkjarc: geometric linkage screwed up 4\n");
+			__mesa_dprintf( "checkjarc: geometric linkage screwed up 4\n");
 			jarc->show();
 			jarc->next->show();
 #endif
Index: src/glu/sgi/libnurbs/internals/arcsorter.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/arcsorter.cc,v
retrieving revision 1.1
diff -u -b -B -u -r1.1 arcsorter.cc
--- src/glu/sgi/libnurbs/internals/arcsorter.cc	17 Mar 2001 00:25:40 -0000	1.1
+++ src/glu/sgi/libnurbs/internals/arcsorter.cc	13 Mar 2006 03:04:10 -0000
@@ -54,7 +54,7 @@
 int
 ArcSorter::qscmp( char *, char * )
 {
-    dprintf( "ArcSorter::qscmp: pure virtual called\n" );
+    __mesa_dprintf( "ArcSorter::qscmp: pure virtual called\n" );
     return 0;
 }
 
Index: src/glu/sgi/libnurbs/internals/basiccrveval.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/basiccrveval.cc,v
retrieving revision 1.3
diff -u -b -B -u -r1.3 basiccrveval.cc
--- src/glu/sgi/libnurbs/internals/basiccrveval.cc	24 Nov 2003 15:19:28 -0000	1.3
+++ src/glu/sgi/libnurbs/internals/basiccrveval.cc	13 Mar 2006 03:04:10 -0000
@@ -45,7 +45,7 @@
 BasicCurveEvaluator::domain1f( REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "domain1f\n" );
+    __mesa_dprintf( "domain1f\n" );
 #endif
 }
 
@@ -53,7 +53,7 @@
 BasicCurveEvaluator::range1f( long , REAL *, REAL * )
 {
 #ifndef NDEBUG
-    dprintf( "range1f\n" );
+    __mesa_dprintf( "range1f\n" );
 #endif
 }
 
@@ -61,7 +61,7 @@
 BasicCurveEvaluator::enable( long )
 {
 #ifndef NDEBUG
-    dprintf( "enable\n" );
+    __mesa_dprintf( "enable\n" );
 #endif
 }
 
@@ -69,7 +69,7 @@
 BasicCurveEvaluator::disable( long )
 {
 #ifndef NDEBUG
-    dprintf( "disable\n" );
+    __mesa_dprintf( "disable\n" );
 #endif
 }
 
@@ -77,7 +77,7 @@
 BasicCurveEvaluator::bgnmap1f( long )
 {
 #ifndef NDEBUG
-    dprintf( "bgnmap1f\n" );
+    __mesa_dprintf( "bgnmap1f\n" );
 #endif
 }
 
@@ -85,7 +85,7 @@
 BasicCurveEvaluator::map1f( long, REAL, REAL, long, long, REAL * )
 {
 #ifndef NDEBUG
-    dprintf( "map1f\n" );
+    __mesa_dprintf( "map1f\n" );
 #endif
 }
 
@@ -93,7 +93,7 @@
 BasicCurveEvaluator::mapgrid1f( long, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "mapgrid1f\n" );
+    __mesa_dprintf( "mapgrid1f\n" );
 #endif
 }
 
@@ -101,7 +101,7 @@
 BasicCurveEvaluator::mapmesh1f( long, long, long )
 {
 #ifndef NDEBUG
-    dprintf( "mapmesh1f\n" );
+    __mesa_dprintf( "mapmesh1f\n" );
 #endif
 }
 
@@ -109,7 +109,7 @@
 BasicCurveEvaluator::evalcoord1f( long, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "evalcoord1f\n" );
+    __mesa_dprintf( "evalcoord1f\n" );
 #endif
 }
 
@@ -117,7 +117,7 @@
 BasicCurveEvaluator::endmap1f( void )
 {
 #ifndef NDEBUG
-    dprintf( "endmap1f\n" );
+    __mesa_dprintf( "endmap1f\n" );
 #endif
 }
 
@@ -125,7 +125,7 @@
 BasicCurveEvaluator::bgnline( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnline\n" );
+    __mesa_dprintf( "bgnline\n" );
 #endif
 }
 
@@ -133,6 +133,6 @@
 BasicCurveEvaluator::endline( void )
 {
 #ifndef NDEBUG
-    dprintf( "endline\n" );
+    __mesa_dprintf( "endline\n" );
 #endif
 }
Index: src/glu/sgi/libnurbs/internals/basicsurfeval.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/basicsurfeval.cc,v
retrieving revision 1.3
diff -u -b -B -u -r1.3 basicsurfeval.cc
--- src/glu/sgi/libnurbs/internals/basicsurfeval.cc	24 Nov 2003 15:19:28 -0000	1.3
+++ src/glu/sgi/libnurbs/internals/basicsurfeval.cc	13 Mar 2006 03:04:10 -0000
@@ -49,7 +49,7 @@
 BasicSurfaceEvaluator::domain2f( REAL, REAL, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "domain2f\n" );
+    __mesa_dprintf( "domain2f\n" );
 #endif
 }
 
@@ -57,7 +57,7 @@
 BasicSurfaceEvaluator::polymode( long )
 {
 #ifndef NDEBUG
-    dprintf( "polymode\n" );
+    __mesa_dprintf( "polymode\n" );
 #endif
 }
 
@@ -65,7 +65,7 @@
 BasicSurfaceEvaluator::range2f( long type, REAL *from, REAL *to )
 {
 #ifndef NDEBUG
-    dprintf( "range2f type %ld, from (%g,%g), to (%g,%g)\n",
+    __mesa_dprintf( "range2f type %ld, from (%g,%g), to (%g,%g)\n",
 		type, from[0], from[1], to[0], to[1] );
 #endif
 }
@@ -74,7 +74,7 @@
 BasicSurfaceEvaluator::enable( long )
 {
 #ifndef NDEBUG
-    dprintf( "enable\n" );
+    __mesa_dprintf( "enable\n" );
 #endif
 }
 
@@ -82,7 +82,7 @@
 BasicSurfaceEvaluator::disable( long )
 {
 #ifndef NDEBUG
-    dprintf( "disable\n" );
+    __mesa_dprintf( "disable\n" );
 #endif
 }
 
@@ -90,7 +90,7 @@
 BasicSurfaceEvaluator::bgnmap2f( long )
 {
 #ifndef NDEBUG
-    dprintf( "bgnmap2f\n" );
+    __mesa_dprintf( "bgnmap2f\n" );
 #endif
 }
 
@@ -98,7 +98,7 @@
 BasicSurfaceEvaluator::endmap2f( void )
 {
 #ifndef NDEBUG
-    dprintf( "endmap2f\n" );
+    __mesa_dprintf( "endmap2f\n" );
 #endif
 }
 
@@ -108,7 +108,7 @@
 			      REAL * )
 {
 #ifndef NDEBUG
-    dprintf( "map2f\n" );
+    __mesa_dprintf( "map2f\n" );
 #endif
 }
 
@@ -116,7 +116,7 @@
 BasicSurfaceEvaluator::mapgrid2f( long, REAL, REAL, long, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "mapgrid2f\n" );
+    __mesa_dprintf( "mapgrid2f\n" );
 #endif
 }
 
@@ -124,7 +124,7 @@
 BasicSurfaceEvaluator::mapmesh2f( long, long, long, long, long )
 {
 #ifndef NDEBUG
-    dprintf( "mapmesh2f\n" );
+    __mesa_dprintf( "mapmesh2f\n" );
 #endif
 }
 
@@ -132,7 +132,7 @@
 BasicSurfaceEvaluator::evalcoord2f( long, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "evalcoord2f\n" );
+    __mesa_dprintf( "evalcoord2f\n" );
 #endif
 }
 
@@ -140,7 +140,7 @@
 BasicSurfaceEvaluator::evalpoint2i( long, long )
 {
 #ifndef NDEBUG
-    dprintf( "evalpoint2i\n" );
+    __mesa_dprintf( "evalpoint2i\n" );
 #endif
 }
 
@@ -148,7 +148,7 @@
 BasicSurfaceEvaluator::bgnline( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnline\n" );
+    __mesa_dprintf( "bgnline\n" );
 #endif
 }
 
@@ -156,7 +156,7 @@
 BasicSurfaceEvaluator::endline( void )
 {
 #ifndef NDEBUG
-    dprintf( "endline\n" );
+    __mesa_dprintf( "endline\n" );
 #endif
 }
 
@@ -164,7 +164,7 @@
 BasicSurfaceEvaluator::bgnclosedline( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnclosedline\n" );
+    __mesa_dprintf( "bgnclosedline\n" );
 #endif
 }
 
@@ -172,7 +172,7 @@
 BasicSurfaceEvaluator::endclosedline( void )
 {
 #ifndef NDEBUG
-    dprintf( "endclosedline\n" );
+    __mesa_dprintf( "endclosedline\n" );
 #endif
 }
 
@@ -180,7 +180,7 @@
 BasicSurfaceEvaluator::bgntfan( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgntfan\n" );
+    __mesa_dprintf( "bgntfan\n" );
 #endif
 }
 
@@ -194,7 +194,7 @@
 BasicSurfaceEvaluator::bgntmesh( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgntmesh\n" );
+    __mesa_dprintf( "bgntmesh\n" );
 #endif
 }
 
@@ -202,7 +202,7 @@
 BasicSurfaceEvaluator::swaptmesh( void )
 {
 #ifndef NDEBUG
-    dprintf( "swaptmesh\n" );
+    __mesa_dprintf( "swaptmesh\n" );
 #endif
 }
 
@@ -210,7 +210,7 @@
 BasicSurfaceEvaluator::endtmesh( void )
 {
 #ifndef NDEBUG
-    dprintf( "endtmesh\n" );
+    __mesa_dprintf( "endtmesh\n" );
 #endif
 }
 
@@ -218,7 +218,7 @@
 BasicSurfaceEvaluator::bgnqstrip( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnqstrip\n" );
+    __mesa_dprintf( "bgnqstrip\n" );
 #endif
 }
 
@@ -226,7 +226,7 @@
 BasicSurfaceEvaluator::endqstrip( void )
 {
 #ifndef NDEBUG
-    dprintf( "endqstrip\n" );
+    __mesa_dprintf( "endqstrip\n" );
 #endif
 }
 
Index: src/glu/sgi/libnurbs/internals/bin.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/bin.cc,v
retrieving revision 1.2
diff -u -b -B -u -r1.2 bin.cc
--- src/glu/sgi/libnurbs/internals/bin.cc	12 May 2004 15:29:36 -0000	1.2
+++ src/glu/sgi/libnurbs/internals/bin.cc	13 Mar 2006 03:04:10 -0000
@@ -123,7 +123,7 @@
 Bin::show( char *name )
 {
 #ifndef NDEBUG
-    dprintf( "%s\n", name );
+    __mesa_dprintf( "%s\n", name );
     for( Arc_ptr jarc = firstarc(); jarc; jarc = nextarc() )
         jarc->show( );
 #endif
@@ -160,7 +160,7 @@
     	    REAL t1 = pts[0].param[1];
     	    REAL s2 = pts[1].param[0];
     	    REAL t2 = pts[1].param[1];
-	   dprintf( "arc (%g,%g) (%g,%g)\n", s1, t1, s2, t2 );
+	   __mesa_dprintf( "arc (%g,%g) (%g,%g)\n", s1, t1, s2, t2 );
 #endif
 	}
     }
Index: src/glu/sgi/libnurbs/internals/ccw.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/ccw.cc,v
retrieving revision 1.2
diff -u -b -B -u -r1.2 ccw.cc
--- src/glu/sgi/libnurbs/internals/ccw.cc	1 Nov 2002 23:35:07 -0000	1.2
+++ src/glu/sgi/libnurbs/internals/ccw.cc	13 Mar 2006 03:04:10 -0000
@@ -70,7 +70,7 @@
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 0 );
+    __mesa_dprintf( "arc_ccw_turn, p = %d\n", 0 );
 #endif
 
     // the arcs lie on the line (0 == v1->param[0])
@@ -88,7 +88,7 @@
     while( 1 ) {
 	if( v1next->param[0] < v2next->param[0] ) {
 #ifndef NDEBUG
-	    dprintf( "case a\n" );
+	    __mesa_dprintf( "case a\n" );
 #endif
 	    assert( v1->param[0] <= v1next->param[0] );
 	    assert( v2->param[0] <= v1next->param[0] );
@@ -101,12 +101,12 @@
 			return sgn;
 		   } else {
 #ifdef DEBUG
-			dprintf( "decr\n" );
+			__mesa_dprintf( "decr\n" );
 #endif
 			v1 = v1next--;
 			if( v1 == v1last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    __mesa_dprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -117,7 +117,7 @@
 	    }
 	} else if( v1next->param[0] > v2next->param[0] ) {
 #ifndef NDEBUG
-	    dprintf( "case b\n" );
+	    __mesa_dprintf( "case b\n" );
 #endif
 	    assert( v1->param[0] <= v2next->param[0] );
 	    assert( v2->param[0] <= v2next->param[0] );
@@ -130,12 +130,12 @@
 			return sgn;
 		   } else {
 #ifdef DEBUG
-			dprintf( "incr\n" );
+			__mesa_dprintf( "incr\n" );
 #endif
 			v2 = v2next++;
 			if( v2 == v2last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    __mesa_dprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -146,7 +146,7 @@
 	    }
 	} else {
 #ifndef NDEBUG
-	    dprintf( "case ab\n" );
+	    __mesa_dprintf( "case ab\n" );
 #endif
 	    if( v1next->param[1] < v2next->param[1] )
 		return 0;
@@ -154,12 +154,12 @@
 		return 1;
 	    else {
 #ifdef DEBUG
-		dprintf( "incr\n" );
+		__mesa_dprintf( "incr\n" );
 #endif
 		v2 = v2next++;
 		if( v2 == v2last ) {
 #ifdef DEBUG
-		    dprintf( "no good results\n" );
+		    __mesa_dprintf( "no good results\n" );
 #endif
 		    return 0; // ill-conditioned, guess answer
 		}
@@ -183,7 +183,7 @@
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 0 );
+    __mesa_dprintf( "arc_ccw_turn, p = %d\n", 0 );
 #endif
 
     // the arcs lie on the line (0 == v1->param[0])
@@ -201,7 +201,7 @@
     while( 1 ) {
 	if( v1next->param[0] > v2next->param[0] ) {
 #ifndef NDEBUG
-	    dprintf( "case c\n" );
+	    __mesa_dprintf( "case c\n" );
 #endif
 	    assert( v1->param[0] >= v1next->param[0] );
 	    assert( v2->param[0] >= v1next->param[0] );
@@ -215,11 +215,11 @@
 		    else {
 			v1 = v1next--;
 #ifdef DEBUG
-			dprintf( "decr\n" );
+			__mesa_dprintf( "decr\n" );
 #endif
 			if( v1 == v1last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    __mesa_dprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -230,7 +230,7 @@
 	    }
 	} else if( v1next->param[0] < v2next->param[0] ) {
 #ifndef NDEBUG
-	    dprintf( "case d\n" );
+	    __mesa_dprintf( "case d\n" );
 #endif
 	    assert( v1->param[0] >= v2next->param[0] );
 	    assert( v2->param[0] >= v2next->param[0] );
@@ -244,11 +244,11 @@
 		    else {
 			v2 = v2next++;
 #ifdef DEBUG
-			dprintf( "incr\n" );
+			__mesa_dprintf( "incr\n" );
 #endif
 			if( v2 == v2last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    __mesa_dprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -259,7 +259,7 @@
 	    }
 	} else {
 #ifdef DEBUG
-	    dprintf( "case cd\n" );
+	    __mesa_dprintf( "case cd\n" );
 #endif
 	    if( v1next->param[1] < v2next->param[1] )
 		return 1;
@@ -268,11 +268,11 @@
 	    else {
 		v2 = v2next++;
 #ifdef DEBUG
-		dprintf( "incr\n" );
+		__mesa_dprintf( "incr\n" );
 #endif
 		if( v2 == v2last ) {
 #ifdef DEBUG
-		    dprintf( "no good results\n" );
+		    __mesa_dprintf( "no good results\n" );
 #endif
 		    return 0; // ill-conditioned, guess answer
 		}
@@ -296,7 +296,7 @@
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 1 );
+    __mesa_dprintf( "arc_ccw_turn, p = %d\n", 1 );
 #endif
 
     // the arcs lie on the line (1 == v1->param[1])
@@ -314,7 +314,7 @@
     while( 1 ) {
 	if( v1next->param[1] < v2next->param[1] ) {
 #ifndef NDEBUG
-	    dprintf( "case a\n" );
+	    __mesa_dprintf( "case a\n" );
 #endif
 	    assert( v1->param[1] <= v1next->param[1] );
 	    assert( v2->param[1] <= v1next->param[1] );
@@ -327,12 +327,12 @@
 			return sgn;
 		   } else {
 #ifdef DEBUG
-			dprintf( "decr\n" );
+			__mesa_dprintf( "decr\n" );
 #endif
 			v1 = v1next--;
 			if( v1 == v1last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    __mesa_dprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -343,7 +343,7 @@
 	    }
 	} else if( v1next->param[1] > v2next->param[1] ) {
 #ifndef NDEBUG
-	    dprintf( "case b\n" );
+	    __mesa_dprintf( "case b\n" );
 #endif
 	    assert( v1->param[1] <= v2next->param[1] );
 	    assert( v2->param[1] <= v2next->param[1] );
@@ -356,12 +356,12 @@
 			return sgn;
 		   } else {
 #ifdef DEBUG
-			dprintf( "incr\n" );
+			__mesa_dprintf( "incr\n" );
 #endif
 			v2 = v2next++;
 			if( v2 == v2last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    __mesa_dprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -372,7 +372,7 @@
 	    }
 	} else {
 #ifdef DEBUG
-	    dprintf( "case ab\n" );
+	    __mesa_dprintf( "case ab\n" );
 #endif
 	    if( v1next->param[0] < v2next->param[0] )
 		return 1;
@@ -380,12 +380,12 @@
 		return 0;
 	    else {
 #ifdef DEBUG
-		dprintf( "incr\n" );
+		__mesa_dprintf( "incr\n" );
 #endif
 		v2 = v2next++;
 		if( v2 == v2last ) {
 #ifdef DEBUG
-		    dprintf( "no good results\n" );
+		    __mesa_dprintf( "no good results\n" );
 #endif
 		    return 0; // ill-conditioned, guess answer
 		}
@@ -409,7 +409,7 @@
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 1 );
+    __mesa_dprintf( "arc_ccw_turn, p = %d\n", 1 );
 #endif
 
     // the arcs lie on the line (1 == v1->param[1])
@@ -427,7 +427,7 @@
     while( 1 ) {
 	if( v1next->param[1] > v2next->param[1] ) {
 #ifndef NDEBUG
-	    dprintf( "case c\n" );
+	    __mesa_dprintf( "case c\n" );
 #endif
 	    assert( v1->param[1] >= v1next->param[1] );
 	    assert( v2->param[1] >= v1next->param[1] );
@@ -441,11 +441,11 @@
 		    else {
 			v1 = v1next--;
 #ifdef DEBUG
-			dprintf( "decr\n" );
+			__mesa_dprintf( "decr\n" );
 #endif
 			if( v1 == v1last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    __mesa_dprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -456,7 +456,7 @@
 	    }
 	} else if( v1next->param[1] < v2next->param[1] ) {
 #ifndef NDEBUG
-	    dprintf( "case d\n" );
+	    __mesa_dprintf( "case d\n" );
 	    assert( v1->param[1] >= v2next->param[1] );
 	    assert( v2->param[1] >= v2next->param[1] );
 #endif
@@ -470,11 +470,11 @@
 		    else {
 			v2 = v2next++;
 #ifdef DEBUG
-			dprintf( "incr\n" );
+			__mesa_dprintf( "incr\n" );
 #endif
 			if( v2 == v2last ) {
 #ifdef DEBUG
-			    dprintf( "no good results\n" );
+			    __mesa_dprintf( "no good results\n" );
 #endif
 			    return 0; // ill-conditioned, guess answer
 			}
@@ -485,7 +485,7 @@
 	    }
 	} else {
 #ifdef DEBUG
-	    dprintf( "case cd\n" );
+	    __mesa_dprintf( "case cd\n" );
 #endif
 	    if( v1next->param[0] < v2next->param[0] )
 		return 0;
@@ -494,11 +494,11 @@
 	    else {
 		v2 = v2next++;
 #ifdef DEBUG
-		dprintf( "incr\n" );
+		__mesa_dprintf( "incr\n" );
 #endif
 		if( v2 == v2last ) {
 #ifdef DEBUG
-		    dprintf( "no good results\n" );
+		    __mesa_dprintf( "no good results\n" );
 #endif
 		    return 0; // ill-conditioned, guess answer
 		}
Index: src/glu/sgi/libnurbs/internals/knotvector.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/knotvector.cc,v
retrieving revision 1.3
diff -u -b -B -u -r1.3 knotvector.cc
--- src/glu/sgi/libnurbs/internals/knotvector.cc	24 Nov 2003 15:19:28 -0000	1.3
+++ src/glu/sgi/libnurbs/internals/knotvector.cc	13 Mar 2006 03:04:10 -0000
@@ -129,11 +129,11 @@
 void Knotvector::show( char *msg )
 {
 #ifndef NDEBUG
-    dprintf( "%s\n", msg );
-    dprintf( "order = %ld, count = %ld\n", order, knotcount );
+    __mesa_dprintf( "%s\n", msg );
+    __mesa_dprintf( "order = %ld, count = %ld\n", order, knotcount );
 
     for( int i=0; i<knotcount; i++ )
-	dprintf( "knot[%d] = %g\n", i, knotlist[i] );
+	__mesa_dprintf( "knot[%d] = %g\n", i, knotlist[i] );
 #endif
 }
 
Index: src/glu/sgi/libnurbs/internals/nurbsinterfac.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc,v
retrieving revision 1.3
diff -u -b -B -u -r1.3 nurbsinterfac.cc
--- src/glu/sgi/libnurbs/internals/nurbsinterfac.cc	24 Nov 2003 15:19:28 -0000	1.3
+++ src/glu/sgi/libnurbs/internals/nurbsinterfac.cc	13 Mar 2006 03:04:11 -0000
@@ -232,7 +232,7 @@
 	}
 	if( i != count ) {
 	    do_nurbserror( 37 );
-	    dprintf( "point %d (%f,%f)\n", i, x, y );
+	    __mesa_dprintf( "point %d (%f,%f)\n", i, x, y );
 	    isDataValid = 0;
 	    return;
 	}
@@ -247,7 +247,7 @@
 	}
 	if( i != count ) {
 	    do_nurbserror( 37 );
-	    dprintf( "point %d (%f,%f)\n", i, x, y );
+	    __mesa_dprintf( "point %d (%f,%f)\n", i, x, y );
 	    isDataValid = 0;
 	    return;
 	}
@@ -460,7 +460,7 @@
 	mapdesc->setBboxsize( mat );
     } else {
 #ifndef NDEBUG
-        dprintf( "ERRORRORRORR!!!\n");
+        __mesa_dprintf( "ERRORRORRORR!!!\n");
 #endif
     }
 }
@@ -488,7 +488,7 @@
 	mapdesc->setBmat( mat, rstride, cstride );
     } else {
 #ifndef NDEBUG
-        dprintf( "ERRORRORRORR!!!\n");
+        __mesa_dprintf( "ERRORRORRORR!!!\n");
 #endif
     }
 }
Index: src/glu/sgi/libnurbs/internals/nurbstess.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/nurbstess.cc,v
retrieving revision 1.1
diff -u -b -B -u -r1.1 nurbstess.cc
--- src/glu/sgi/libnurbs/internals/nurbstess.cc	17 Mar 2001 00:25:41 -0000	1.1
+++ src/glu/sgi/libnurbs/internals/nurbstess.cc	13 Mar 2006 03:04:11 -0000
@@ -79,7 +79,7 @@
 NurbsTessellator::makeobj( int )
 {
 #ifndef NDEBUG
-   dprintf( "makeobj\n" );
+   __mesa_dprintf( "makeobj\n" );
 #endif
 }
 
@@ -87,7 +87,7 @@
 NurbsTessellator::closeobj( void )
 {
 #ifndef NDEBUG
-   dprintf( "closeobj\n" );
+   __mesa_dprintf( "closeobj\n" );
 #endif
 }
 
@@ -95,7 +95,7 @@
 NurbsTessellator::bgnrender( void )
 {
 #ifndef NDEBUG
-   dprintf( "bgnrender\n" );
+   __mesa_dprintf( "bgnrender\n" );
 #endif
 }
 
@@ -103,7 +103,7 @@
 NurbsTessellator::endrender( void )
 {
 #ifndef NDEBUG
-    dprintf( "endrender\n" );
+    __mesa_dprintf( "endrender\n" );
 #endif
 }
 
Index: src/glu/sgi/libnurbs/internals/patch.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/patch.cc,v
retrieving revision 1.3
diff -u -b -B -u -r1.3 patch.cc
--- src/glu/sgi/libnurbs/internals/patch.cc	1 Nov 2002 23:35:07 -0000	1.3
+++ src/glu/sgi/libnurbs/internals/patch.cc	13 Mar 2006 03:04:11 -0000
@@ -439,7 +439,7 @@
     }
 
 #ifdef DEBUG
-    dprintf( "sidesteps %g %g %g %g, stepsize %g %g\n",
+    __mesa_dprintf( "sidesteps %g %g %g %g, stepsize %g %g\n",
 	pspec[0].sidestep[0], pspec[0].sidestep[1],
 	pspec[1].sidestep[0], pspec[1].sidestep[1],
 	pspec[0].stepsize, pspec[1].stepsize );
Index: src/glu/sgi/libnurbs/internals/quilt.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/quilt.cc,v
retrieving revision 1.2
diff -u -b -B -u -r1.2 quilt.cc
--- src/glu/sgi/libnurbs/internals/quilt.cc	1 Nov 2002 23:35:07 -0000	1.2
+++ src/glu/sgi/libnurbs/internals/quilt.cc	13 Mar 2006 03:04:11 -0000
@@ -91,12 +91,12 @@
     for( int i=0; i!= qspec[0].order * qspec[0].width; i++ ) {
 	for( int j = 0; j!= qspec[1].order * qspec[1].width; j++ ) {
 	    for( int k=0; k < nc; k++ )
-		dprintf(  "%g ", ps[i*qspec[0].stride + j*qspec[1].stride + k] );
-	    dprintf(  "\n" );
+		__mesa_dprintf(  "%g ", ps[i*qspec[0].stride + j*qspec[1].stride + k] );
+	    __mesa_dprintf(  "\n" );
 	}
-	dprintf(  "\n" );
+	__mesa_dprintf(  "\n" );
     }
-    dprintf( "\n" );
+    __mesa_dprintf( "\n" );
 #endif
 }
 
Index: src/glu/sgi/libnurbs/internals/sorter.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/sorter.cc,v
retrieving revision 1.2
diff -u -b -B -u -r1.2 sorter.cc
--- src/glu/sgi/libnurbs/internals/sorter.cc	29 Nov 2001 16:16:55 -0000	1.2
+++ src/glu/sgi/libnurbs/internals/sorter.cc	13 Mar 2006 03:04:11 -0000
@@ -57,7 +57,7 @@
 int
 Sorter::qscmp( char *, char * )
 {
-    dprintf( "Sorter::qscmp: pure virtual called\n" );
+    __mesa_dprintf( "Sorter::qscmp: pure virtual called\n" );
     return 0;
 }
 
@@ -65,14 +65,14 @@
 void
 Sorter::qsexc( char *, char * )
 {
-    dprintf( "Sorter::qsexc: pure virtual called\n" );
+    __mesa_dprintf( "Sorter::qsexc: pure virtual called\n" );
 }
 
 
 void
 Sorter::qstexc( char *, char *, char * )
 {
-    dprintf( "Sorter::qstexc: pure virtual called\n" );
+    __mesa_dprintf( "Sorter::qstexc: pure virtual called\n" );
 }
 
 void
Index: src/glu/sgi/libnurbs/internals/splitarcs.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/splitarcs.cc,v
retrieving revision 1.1
diff -u -b -B -u -r1.1 splitarcs.cc
--- src/glu/sgi/libnurbs/internals/splitarcs.cc	17 Mar 2001 00:25:41 -0000	1.1
+++ src/glu/sgi/libnurbs/internals/splitarcs.cc	13 Mar 2006 03:04:12 -0000
@@ -133,14 +133,14 @@
 	     undersampling */
     if( ! ( jarc1->tail()[0] < (jarc1)->head()[0] ) ) {
 #ifndef NDEBUG
-	dprintf( "s difference %f\n",  (jarc1)->tail()[0] - (jarc1)->head()[0] );
+	__mesa_dprintf( "s difference %f\n",  (jarc1)->tail()[0] - (jarc1)->head()[0] );
 #endif
 	::mylongjmp( jumpbuffer, 28 );
     }
 
     if( ! ( jarc2->tail()[0] > (jarc2)->head()[0] ) ) { 
 #ifndef NDEBUG
-	dprintf( "s difference %f\n",  (jarc2)->tail()[0] - (jarc2)->head()[0] );
+	__mesa_dprintf( "s difference %f\n",  (jarc2)->tail()[0] - (jarc2)->head()[0] );
 #endif
 	::mylongjmp( jumpbuffer, 28 );
     }
@@ -232,14 +232,14 @@
 	     undersampling */
     if( ! ( jarc1->tail()[1] < (jarc1)->head()[1] ) ) {
 #ifndef NDEBUG
-	dprintf( "t difference %f\n",  jarc1->tail()[1] - (jarc1)->head()[1] );
+	__mesa_dprintf( "t difference %f\n",  jarc1->tail()[1] - (jarc1)->head()[1] );
 #endif
 	::mylongjmp( jumpbuffer, 28 );
     }
 
     if( ! ( jarc2->tail()[1] > (jarc2)->head()[1] ) ) { 
 #ifndef NDEBUG
-	dprintf( "t difference %f\n",  jarc2->tail()[1] - (jarc2)->head()[1] );
+	__mesa_dprintf( "t difference %f\n",  jarc2->tail()[1] - (jarc2)->head()[1] );
 #endif
 	::mylongjmp( jumpbuffer, 28 );
     }
Index: src/glu/sgi/libnurbs/internals/tobezier.cc
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/internals/tobezier.cc,v
retrieving revision 1.1
diff -u -b -B -u -r1.1 tobezier.cc
--- src/glu/sgi/libnurbs/internals/tobezier.cc	17 Mar 2001 00:25:41 -0000	1.1
+++ src/glu/sgi/libnurbs/internals/tobezier.cc	13 Mar 2006 03:04:12 -0000
@@ -360,7 +360,7 @@
 	    next->showpts( outpt );
     } else {
         for( REAL *lpt=outpt+prewidth; outpt != lpt; outpt += poststride )
-	    dprintf(  "show %g %g %g\n", outpt[0], outpt[1], outpt[2] );
+	    __mesa_dprintf(  "show %g %g %g\n", outpt[0], outpt[1], outpt[2] );
     }
 }
 
Index: src/glu/sgi/libnurbs/nurbtess/mystdio.h
===================================================================
RCS file: /cvs/mesa/Mesa/src/glu/sgi/libnurbs/nurbtess/mystdio.h,v
retrieving revision 1.3
diff -u -b -B -u -r1.3 mystdio.h
--- src/glu/sgi/libnurbs/nurbtess/mystdio.h	19 Mar 2001 17:52:03 -0000	1.3
+++ src/glu/sgi/libnurbs/nurbtess/mystdio.h	13 Mar 2006 03:04:12 -0000
@@ -43,20 +43,20 @@
 #define __glumystdio_h_
 
 #ifdef STANDALONE
-inline void dprintf( char *, ... ) { }
+inline void __mesa_dprintf( char *, ... ) { }
 #endif
 
 #ifdef LIBRARYBUILD
 #ifndef NDEBUG
 #include <stdio.h>
-#define dprintf printf
+#define __mesa_dprintf printf
 #else
-inline void dprintf( char *, ... ) { }
+inline void __mesa_dprintf( char *, ... ) { }
 #endif
 #endif
 
 #ifdef GLBUILD
-inline void dprintf( char *, ... ) { }
+inline void __mesa_dprintf( char *, ... ) { }
 #endif
 
 #ifndef NULL