replace dprintf() with _glu_dprintf() (bug 6244)

diff --git a/src/glu/sgi/libnurbs/interface/mystdio.h b/src/glu/sgi/libnurbs/interface/mystdio.h
index 39d309c24d59d68e6a066fad79239aa3103be419..6d737257f7e062e045beaaf9bac5363002008c38 100644 (file)
--- a/src/glu/sgi/libnurbs/interface/mystdio.h
+++ b/src/glu/sgi/libnurbs/interface/mystdio.h
@@ -35,28 +35,28 @@
 /*
  * mystdio.h
  *
- * $Date: 2001/03/19 17:52:02 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/mystdio.h,v 1.3 2001/03/19 17:52:02 pesco Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.4 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/interface/mystdio.h,v 1.4 2006/03/14 15:08:52 brianp Exp $
  */
 
 #ifndef __glumystdio_h_
 #define __glumystdio_h_
 
 #ifdef STANDALONE
-inline void dprintf( char *, ... ) { }
+inline void _glu_dprintf( char *, ... ) { }
 #endif
 
 #ifdef LIBRARYBUILD
 #ifndef NDEBUG
 #include <stdio.h>
-#define dprintf printf
+#define _glu_dprintf printf
 #else
-inline void dprintf( char *, ... ) { }
+inline void _glu_dprintf( char *, ... ) { }
 #endif
 #endif
 
 #ifdef GLBUILD
-inline void dprintf( char *, ... ) { }
+inline void _glu_dprintf( char *, ... ) { }
 #endif
 
 #ifndef NULL

diff --git a/src/glu/sgi/libnurbs/internals/arc.cc b/src/glu/sgi/libnurbs/internals/arc.cc
index f795e00cd7ea3ddd7ab9dbd876b5fc72a7fccd30..b85139de937b2233b50918b1dc0d111dfa109fdd 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/arc.cc
+++ b/src/glu/sgi/libnurbs/internals/arc.cc
@@ -156,9 +156,9 @@ void
 Arc::show()
 {
 #ifndef NDEBUG
-    dprintf( "\tPWLARC NP: %d FL: 1\n", pwlArc->npts );
+    _glu_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],
+        _glu_dprintf( "\t\tVERTEX %f %f\n", pwlArc->pts[i].param[0],
                        pwlArc->pts[i].param[1] );
     }
 #endif
@@ -175,14 +175,14 @@ Arc::print( void )
     Arc_ptr jarc = this;
 
 #ifndef NDEBUG
-    dprintf( "BGNTRIM\n" );
+    _glu_dprintf( "BGNTRIM\n" );
 #endif
     do {
        jarc->show( );
        jarc = jarc->next;
     } while (jarc != this);
 #ifndef NDEBUG
-    dprintf("ENDTRIM\n" );
+    _glu_dprintf("ENDTRIM\n" );
 #endif
 }
 
@@ -203,8 +203,8 @@ Arc::isDisconnected( void )
     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] );
+       _glu_dprintf( "x coord = %f %f %f\n", p0[0], p1[0], p0[0] - p1[0] );
+       _glu_dprintf( "y coord = %f %f %f\n", p0[1], p1[1], p0[1] - p1[1] );
 #endif
        return 1;
     } else {
@@ -244,7 +244,7 @@ Arc::check( void )
 
        if (jarc->prev == 0 || jarc->next == 0) {
 #ifndef NDEBUG
-           dprintf( "checkjarc:null next/prev pointer\n");
+           _glu_dprintf( "checkjarc:null next/prev pointer\n");
            jarc->print( );
 #endif
            return 0;
@@ -252,7 +252,7 @@ Arc::check( void )
 
        if (jarc->next->prev != jarc) {
 #ifndef NDEBUG
-           dprintf( "checkjarc: pointer linkage screwed up\n");
+           _glu_dprintf( "checkjarc: pointer linkage screwed up\n");
            jarc->print( );
 #endif
            return 0;
@@ -271,7 +271,7 @@ Arc::check( void )
            if( jarc->prev->pwlArc ) {
                if( jarc->tail()[1] != jarc->prev->rhead()[1] ) {
 #ifndef NDEBUG
-                   dprintf( "checkjarc: geometric linkage screwed up 1\n");
+                   _glu_dprintf( "checkjarc: geometric linkage screwed up 1\n");
                    jarc->prev->show();
                    jarc->show();
 #endif
@@ -280,7 +280,7 @@ Arc::check( void )
                if( jarc->tail()[0] != jarc->prev->rhead()[0] ) {
                
 #ifndef NDEBUG
-                   dprintf( "checkjarc: geometric linkage screwed up 2\n");
+                   _glu_dprintf( "checkjarc: geometric linkage screwed up 2\n");
                    jarc->prev->show();
                    jarc->show();
 #endif
@@ -290,7 +290,7 @@ Arc::check( void )
            if( jarc->next->pwlArc ) {
                if( jarc->next->tail()[0] != jarc->rhead()[0] ) {
 #ifndef NDEBUG
-                       dprintf( "checkjarc: geometric linkage screwed up 3\n");
+                       _glu_dprintf( "checkjarc: geometric linkage screwed up 3\n");
                        jarc->show();
                        jarc->next->show();
 #endif
@@ -298,7 +298,7 @@ Arc::check( void )
                }
                if( jarc->next->tail()[1] != jarc->rhead()[1] ) {
 #ifndef NDEBUG
-                       dprintf( "checkjarc: geometric linkage screwed up 4\n");
+                       _glu_dprintf( "checkjarc: geometric linkage screwed up 4\n");
                        jarc->show();
                        jarc->next->show();
 #endif

diff --git a/src/glu/sgi/libnurbs/internals/arcsorter.cc b/src/glu/sgi/libnurbs/internals/arcsorter.cc
index 0737569a0dcf19a55cbb64d78e0eee3fb8ce51bb..1a7f4c69115655497104cf3ff0dc7cf118506b4f 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/arcsorter.cc
+++ b/src/glu/sgi/libnurbs/internals/arcsorter.cc
@@ -35,8 +35,8 @@
 /*
  * arcsorter.c++
  *
- * $Date: 2001/03/17 00:25:40 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/arcsorter.cc,v 1.1 2001/03/17 00:25:40 brianp Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.2 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/arcsorter.cc,v 1.2 2006/03/14 15:08:52 brianp Exp $
  */
 
 #ifndef __gluarcsorter_c_
@@ -54,7 +54,7 @@ ArcSorter::ArcSorter(Subdivider &s) : Sorter( sizeof( Arc ** ) ), subdivider(s)
 int
 ArcSorter::qscmp( char *, char * )
 {
-    dprintf( "ArcSorter::qscmp: pure virtual called\n" );
+    _glu_dprintf( "ArcSorter::qscmp: pure virtual called\n" );
     return 0;
 }
 

diff --git a/src/glu/sgi/libnurbs/internals/basiccrveval.cc b/src/glu/sgi/libnurbs/internals/basiccrveval.cc
index c7e4282360baa7ab1f72dc321f0c371d3b5bb928..cc473e4c2a157755281b8dc62720b18d517d8a6c 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/basiccrveval.cc
+++ b/src/glu/sgi/libnurbs/internals/basiccrveval.cc
@@ -45,7 +45,7 @@ void
 BasicCurveEvaluator::domain1f( REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "domain1f\n" );
+    _glu_dprintf( "domain1f\n" );
 #endif
 }
 
@@ -53,7 +53,7 @@ void
 BasicCurveEvaluator::range1f( long , REAL *, REAL * )
 {
 #ifndef NDEBUG
-    dprintf( "range1f\n" );
+    _glu_dprintf( "range1f\n" );
 #endif
 }
 
@@ -61,7 +61,7 @@ void
 BasicCurveEvaluator::enable( long )
 {
 #ifndef NDEBUG
-    dprintf( "enable\n" );
+    _glu_dprintf( "enable\n" );
 #endif
 }
 
@@ -69,7 +69,7 @@ void
 BasicCurveEvaluator::disable( long )
 {
 #ifndef NDEBUG
-    dprintf( "disable\n" );
+    _glu_dprintf( "disable\n" );
 #endif
 }
 
@@ -77,7 +77,7 @@ void
 BasicCurveEvaluator::bgnmap1f( long )
 {
 #ifndef NDEBUG
-    dprintf( "bgnmap1f\n" );
+    _glu_dprintf( "bgnmap1f\n" );
 #endif
 }
 
@@ -85,7 +85,7 @@ void
 BasicCurveEvaluator::map1f( long, REAL, REAL, long, long, REAL * )
 {
 #ifndef NDEBUG
-    dprintf( "map1f\n" );
+    _glu_dprintf( "map1f\n" );
 #endif
 }
 
@@ -93,7 +93,7 @@ void
 BasicCurveEvaluator::mapgrid1f( long, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "mapgrid1f\n" );
+    _glu_dprintf( "mapgrid1f\n" );
 #endif
 }
 
@@ -101,7 +101,7 @@ void
 BasicCurveEvaluator::mapmesh1f( long, long, long )
 {
 #ifndef NDEBUG
-    dprintf( "mapmesh1f\n" );
+    _glu_dprintf( "mapmesh1f\n" );
 #endif
 }
 
@@ -109,7 +109,7 @@ void
 BasicCurveEvaluator::evalcoord1f( long, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "evalcoord1f\n" );
+    _glu_dprintf( "evalcoord1f\n" );
 #endif
 }
 
@@ -117,7 +117,7 @@ void
 BasicCurveEvaluator::endmap1f( void )
 {
 #ifndef NDEBUG
-    dprintf( "endmap1f\n" );
+    _glu_dprintf( "endmap1f\n" );
 #endif
 }
 
@@ -125,7 +125,7 @@ void
 BasicCurveEvaluator::bgnline( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnline\n" );
+    _glu_dprintf( "bgnline\n" );
 #endif
 }
 
@@ -133,6 +133,6 @@ void
 BasicCurveEvaluator::endline( void )
 {
 #ifndef NDEBUG
-    dprintf( "endline\n" );
+    _glu_dprintf( "endline\n" );
 #endif
 }

diff --git a/src/glu/sgi/libnurbs/internals/basicsurfeval.cc b/src/glu/sgi/libnurbs/internals/basicsurfeval.cc
index ff212bf0b4b2e77311f3b02c6741d88780c03fdf..fad5dd0ada310abd436e27c67e17aed9939609c8 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/basicsurfeval.cc
+++ b/src/glu/sgi/libnurbs/internals/basicsurfeval.cc
@@ -49,7 +49,7 @@ void
 BasicSurfaceEvaluator::domain2f( REAL, REAL, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "domain2f\n" );
+    _glu_dprintf( "domain2f\n" );
 #endif
 }
 
@@ -57,7 +57,7 @@ void
 BasicSurfaceEvaluator::polymode( long )
 {
 #ifndef NDEBUG
-    dprintf( "polymode\n" );
+    _glu_dprintf( "polymode\n" );
 #endif
 }
 
@@ -65,7 +65,7 @@ void
 BasicSurfaceEvaluator::range2f( long type, REAL *from, REAL *to )
 {
 #ifndef NDEBUG
-    dprintf( "range2f type %ld, from (%g,%g), to (%g,%g)\n",
+    _glu_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 @@ void
 BasicSurfaceEvaluator::enable( long )
 {
 #ifndef NDEBUG
-    dprintf( "enable\n" );
+    _glu_dprintf( "enable\n" );
 #endif
 }
 
@@ -82,7 +82,7 @@ void
 BasicSurfaceEvaluator::disable( long )
 {
 #ifndef NDEBUG
-    dprintf( "disable\n" );
+    _glu_dprintf( "disable\n" );
 #endif
 }
 
@@ -90,7 +90,7 @@ void
 BasicSurfaceEvaluator::bgnmap2f( long )
 {
 #ifndef NDEBUG
-    dprintf( "bgnmap2f\n" );
+    _glu_dprintf( "bgnmap2f\n" );
 #endif
 }
 
@@ -98,7 +98,7 @@ void
 BasicSurfaceEvaluator::endmap2f( void )
 {
 #ifndef NDEBUG
-    dprintf( "endmap2f\n" );
+    _glu_dprintf( "endmap2f\n" );
 #endif
 }
 
@@ -108,7 +108,7 @@ BasicSurfaceEvaluator::map2f( long, REAL, REAL, long, long,
                              REAL * )
 {
 #ifndef NDEBUG
-    dprintf( "map2f\n" );
+    _glu_dprintf( "map2f\n" );
 #endif
 }
 
@@ -116,7 +116,7 @@ void
 BasicSurfaceEvaluator::mapgrid2f( long, REAL, REAL, long, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "mapgrid2f\n" );
+    _glu_dprintf( "mapgrid2f\n" );
 #endif
 }
 
@@ -124,7 +124,7 @@ void
 BasicSurfaceEvaluator::mapmesh2f( long, long, long, long, long )
 {
 #ifndef NDEBUG
-    dprintf( "mapmesh2f\n" );
+    _glu_dprintf( "mapmesh2f\n" );
 #endif
 }
 
@@ -132,7 +132,7 @@ void
 BasicSurfaceEvaluator::evalcoord2f( long, REAL, REAL )
 {
 #ifndef NDEBUG
-    dprintf( "evalcoord2f\n" );
+    _glu_dprintf( "evalcoord2f\n" );
 #endif
 }
 
@@ -140,7 +140,7 @@ void
 BasicSurfaceEvaluator::evalpoint2i( long, long )
 {
 #ifndef NDEBUG
-    dprintf( "evalpoint2i\n" );
+    _glu_dprintf( "evalpoint2i\n" );
 #endif
 }
 
@@ -148,7 +148,7 @@ void
 BasicSurfaceEvaluator::bgnline( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnline\n" );
+    _glu_dprintf( "bgnline\n" );
 #endif
 }
 
@@ -156,7 +156,7 @@ void
 BasicSurfaceEvaluator::endline( void )
 {
 #ifndef NDEBUG
-    dprintf( "endline\n" );
+    _glu_dprintf( "endline\n" );
 #endif
 }
 
@@ -164,7 +164,7 @@ void
 BasicSurfaceEvaluator::bgnclosedline( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnclosedline\n" );
+    _glu_dprintf( "bgnclosedline\n" );
 #endif
 }
 
@@ -172,7 +172,7 @@ void
 BasicSurfaceEvaluator::endclosedline( void )
 {
 #ifndef NDEBUG
-    dprintf( "endclosedline\n" );
+    _glu_dprintf( "endclosedline\n" );
 #endif
 }
 
@@ -180,7 +180,7 @@ void
 BasicSurfaceEvaluator::bgntfan( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgntfan\n" );
+    _glu_dprintf( "bgntfan\n" );
 #endif
 }
 
@@ -194,7 +194,7 @@ void
 BasicSurfaceEvaluator::bgntmesh( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgntmesh\n" );
+    _glu_dprintf( "bgntmesh\n" );
 #endif
 }
 
@@ -202,7 +202,7 @@ void
 BasicSurfaceEvaluator::swaptmesh( void )
 {
 #ifndef NDEBUG
-    dprintf( "swaptmesh\n" );
+    _glu_dprintf( "swaptmesh\n" );
 #endif
 }
 
@@ -210,7 +210,7 @@ void
 BasicSurfaceEvaluator::endtmesh( void )
 {
 #ifndef NDEBUG
-    dprintf( "endtmesh\n" );
+    _glu_dprintf( "endtmesh\n" );
 #endif
 }
 
@@ -218,7 +218,7 @@ void
 BasicSurfaceEvaluator::bgnqstrip( void )
 {
 #ifndef NDEBUG
-    dprintf( "bgnqstrip\n" );
+    _glu_dprintf( "bgnqstrip\n" );
 #endif
 }
 
@@ -226,7 +226,7 @@ void
 BasicSurfaceEvaluator::endqstrip( void )
 {
 #ifndef NDEBUG
-    dprintf( "endqstrip\n" );
+    _glu_dprintf( "endqstrip\n" );
 #endif
 }
 

diff --git a/src/glu/sgi/libnurbs/internals/bin.cc b/src/glu/sgi/libnurbs/internals/bin.cc
index 5efda2dd38da155a72425545f810a28bd392168e..ed427567f9100d6c6dd372ea0a7d340ebde94176 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/bin.cc
+++ b/src/glu/sgi/libnurbs/internals/bin.cc
@@ -35,8 +35,8 @@
 /*
  * bin.c++
  *
- * $Date: 2004/05/12 15:29:36 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/bin.cc,v 1.2 2004/05/12 15:29:36 brianp Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.3 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/bin.cc,v 1.3 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include "glimports.h"
@@ -123,7 +123,7 @@ void
 Bin::show( char *name )
 {
 #ifndef NDEBUG
-    dprintf( "%s\n", name );
+    _glu_dprintf( "%s\n", name );
     for( Arc_ptr jarc = firstarc(); jarc; jarc = nextarc() )
         jarc->show( );
 #endif
@@ -160,7 +160,7 @@ Bin::listBezier( void )
            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 );
+          _glu_dprintf( "arc (%g,%g) (%g,%g)\n", s1, t1, s2, t2 );
 #endif
        }
     }

diff --git a/src/glu/sgi/libnurbs/internals/ccw.cc b/src/glu/sgi/libnurbs/internals/ccw.cc
index 4cd92e8780ee8c808c84c0e3ab59369795241b21..b1bb6276f7469b33124983862f0f0bef4fc92fe1 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/ccw.cc
+++ b/src/glu/sgi/libnurbs/internals/ccw.cc
@@ -35,8 +35,8 @@
 /*
  * ccw.c++
  *
- * $Date: 2002/11/01 23:35:07 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/ccw.cc,v 1.2 2002/11/01 23:35:07 brianp Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.3 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/ccw.cc,v 1.3 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include "glimports.h"
@@ -70,7 +70,7 @@ Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 0 );
+    _glu_dprintf( "arc_ccw_turn, p = %d\n", 0 );
 #endif
 
     // the arcs lie on the line (0 == v1->param[0])
@@ -88,7 +88,7 @@ Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
     while( 1 ) {
        if( v1next->param[0] < v2next->param[0] ) {
 #ifndef NDEBUG
-           dprintf( "case a\n" );
+           _glu_dprintf( "case a\n" );
 #endif
            assert( v1->param[0] <= v1next->param[0] );
            assert( v2->param[0] <= v1next->param[0] );
@@ -101,12 +101,12 @@ Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
                        return sgn;
                   } else {
 #ifdef DEBUG
-                       dprintf( "decr\n" );
+                       _glu_dprintf( "decr\n" );
 #endif
                        v1 = v1next--;
                        if( v1 == v1last ) {
 #ifdef DEBUG
-                           dprintf( "no good results\n" );
+                           _glu_dprintf( "no good results\n" );
 #endif
                            return 0; // ill-conditioned, guess answer
                        }
@@ -117,7 +117,7 @@ Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
            }
        } else if( v1next->param[0] > v2next->param[0] ) {
 #ifndef NDEBUG
-           dprintf( "case b\n" );
+           _glu_dprintf( "case b\n" );
 #endif
            assert( v1->param[0] <= v2next->param[0] );
            assert( v2->param[0] <= v2next->param[0] );
@@ -130,12 +130,12 @@ Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
                        return sgn;
                   } else {
 #ifdef DEBUG
-                       dprintf( "incr\n" );
+                       _glu_dprintf( "incr\n" );
 #endif
                        v2 = v2next++;
                        if( v2 == v2last ) {
 #ifdef DEBUG
-                           dprintf( "no good results\n" );
+                           _glu_dprintf( "no good results\n" );
 #endif
                            return 0; // ill-conditioned, guess answer
                        }
@@ -146,7 +146,7 @@ Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
            }
        } else {
 #ifndef NDEBUG
-           dprintf( "case ab\n" );
+           _glu_dprintf( "case ab\n" );
 #endif
            if( v1next->param[1] < v2next->param[1] )
                return 0;
@@ -154,12 +154,12 @@ Subdivider::ccwTurn_sr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
                return 1;
            else {
 #ifdef DEBUG
-               dprintf( "incr\n" );
+               _glu_dprintf( "incr\n" );
 #endif
                v2 = v2next++;
                if( v2 == v2last ) {
 #ifdef DEBUG
-                   dprintf( "no good results\n" );
+                   _glu_dprintf( "no good results\n" );
 #endif
                    return 0; // ill-conditioned, guess answer
                }
@@ -183,7 +183,7 @@ Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 0 );
+    _glu_dprintf( "arc_ccw_turn, p = %d\n", 0 );
 #endif
 
     // the arcs lie on the line (0 == v1->param[0])
@@ -201,7 +201,7 @@ Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0
     while( 1 ) {
        if( v1next->param[0] > v2next->param[0] ) {
 #ifndef NDEBUG
-           dprintf( "case c\n" );
+           _glu_dprintf( "case c\n" );
 #endif
            assert( v1->param[0] >= v1next->param[0] );
            assert( v2->param[0] >= v1next->param[0] );
@@ -215,11 +215,11 @@ Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0
                    else {
                        v1 = v1next--;
 #ifdef DEBUG
-                       dprintf( "decr\n" );
+                       _glu_dprintf( "decr\n" );
 #endif
                        if( v1 == v1last ) {
 #ifdef DEBUG
-                           dprintf( "no good results\n" );
+                           _glu_dprintf( "no good results\n" );
 #endif
                            return 0; // ill-conditioned, guess answer
                        }
@@ -230,7 +230,7 @@ Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0
            }
        } else if( v1next->param[0] < v2next->param[0] ) {
 #ifndef NDEBUG
-           dprintf( "case d\n" );
+           _glu_dprintf( "case d\n" );
 #endif
            assert( v1->param[0] >= v2next->param[0] );
            assert( v2->param[0] >= v2next->param[0] );
@@ -244,11 +244,11 @@ Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0
                    else {
                        v2 = v2next++;
 #ifdef DEBUG
-                       dprintf( "incr\n" );
+                       _glu_dprintf( "incr\n" );
 #endif
                        if( v2 == v2last ) {
 #ifdef DEBUG
-                           dprintf( "no good results\n" );
+                           _glu_dprintf( "no good results\n" );
 #endif
                            return 0; // ill-conditioned, guess answer
                        }
@@ -259,7 +259,7 @@ Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0
            }
        } else {
 #ifdef DEBUG
-           dprintf( "case cd\n" );
+           _glu_dprintf( "case cd\n" );
 #endif
            if( v1next->param[1] < v2next->param[1] )
                return 1;
@@ -268,11 +268,11 @@ Subdivider::ccwTurn_sl( Arc_ptr j1, Arc_ptr j2 ) // dir = 0
            else {
                v2 = v2next++;
 #ifdef DEBUG
-               dprintf( "incr\n" );
+               _glu_dprintf( "incr\n" );
 #endif
                if( v2 == v2last ) {
 #ifdef DEBUG
-                   dprintf( "no good results\n" );
+                   _glu_dprintf( "no good results\n" );
 #endif
                    return 0; // ill-conditioned, guess answer
                }
@@ -296,7 +296,7 @@ Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 1 );
+    _glu_dprintf( "arc_ccw_turn, p = %d\n", 1 );
 #endif
 
     // the arcs lie on the line (1 == v1->param[1])
@@ -314,7 +314,7 @@ Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
     while( 1 ) {
        if( v1next->param[1] < v2next->param[1] ) {
 #ifndef NDEBUG
-           dprintf( "case a\n" );
+           _glu_dprintf( "case a\n" );
 #endif
            assert( v1->param[1] <= v1next->param[1] );
            assert( v2->param[1] <= v1next->param[1] );
@@ -327,12 +327,12 @@ Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
                        return sgn;
                   } else {
 #ifdef DEBUG
-                       dprintf( "decr\n" );
+                       _glu_dprintf( "decr\n" );
 #endif
                        v1 = v1next--;
                        if( v1 == v1last ) {
 #ifdef DEBUG
-                           dprintf( "no good results\n" );
+                           _glu_dprintf( "no good results\n" );
 #endif
                            return 0; // ill-conditioned, guess answer
                        }
@@ -343,7 +343,7 @@ Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
            }
        } else if( v1next->param[1] > v2next->param[1] ) {
 #ifndef NDEBUG
-           dprintf( "case b\n" );
+           _glu_dprintf( "case b\n" );
 #endif
            assert( v1->param[1] <= v2next->param[1] );
            assert( v2->param[1] <= v2next->param[1] );
@@ -356,12 +356,12 @@ Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
                        return sgn;
                   } else {
 #ifdef DEBUG
-                       dprintf( "incr\n" );
+                       _glu_dprintf( "incr\n" );
 #endif
                        v2 = v2next++;
                        if( v2 == v2last ) {
 #ifdef DEBUG
-                           dprintf( "no good results\n" );
+                           _glu_dprintf( "no good results\n" );
 #endif
                            return 0; // ill-conditioned, guess answer
                        }
@@ -372,7 +372,7 @@ Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
            }
        } else {
 #ifdef DEBUG
-           dprintf( "case ab\n" );
+           _glu_dprintf( "case ab\n" );
 #endif
            if( v1next->param[0] < v2next->param[0] )
                return 1;
@@ -380,12 +380,12 @@ Subdivider::ccwTurn_tr( Arc_ptr j1, Arc_ptr j2 ) // dir = 1
                return 0;
            else {
 #ifdef DEBUG
-               dprintf( "incr\n" );
+               _glu_dprintf( "incr\n" );
 #endif
                v2 = v2next++;
                if( v2 == v2last ) {
 #ifdef DEBUG
-                   dprintf( "no good results\n" );
+                   _glu_dprintf( "no good results\n" );
 #endif
                    return 0; // ill-conditioned, guess answer
                }
@@ -409,7 +409,7 @@ Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 )
     assert( v2 != v2last );
 
 #ifndef NDEBUG
-    dprintf( "arc_ccw_turn, p = %d\n", 1 );
+    _glu_dprintf( "arc_ccw_turn, p = %d\n", 1 );
 #endif
 
     // the arcs lie on the line (1 == v1->param[1])
@@ -427,7 +427,7 @@ Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 )
     while( 1 ) {
        if( v1next->param[1] > v2next->param[1] ) {
 #ifndef NDEBUG
-           dprintf( "case c\n" );
+           _glu_dprintf( "case c\n" );
 #endif
            assert( v1->param[1] >= v1next->param[1] );
            assert( v2->param[1] >= v1next->param[1] );
@@ -441,11 +441,11 @@ Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 )
                    else {
                        v1 = v1next--;
 #ifdef DEBUG
-                       dprintf( "decr\n" );
+                       _glu_dprintf( "decr\n" );
 #endif
                        if( v1 == v1last ) {
 #ifdef DEBUG
-                           dprintf( "no good results\n" );
+                           _glu_dprintf( "no good results\n" );
 #endif
                            return 0; // ill-conditioned, guess answer
                        }
@@ -456,7 +456,7 @@ Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 )
            }
        } else if( v1next->param[1] < v2next->param[1] ) {
 #ifndef NDEBUG
-           dprintf( "case d\n" );
+           _glu_dprintf( "case d\n" );
            assert( v1->param[1] >= v2next->param[1] );
            assert( v2->param[1] >= v2next->param[1] );
 #endif
@@ -470,11 +470,11 @@ Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 )
                    else {
                        v2 = v2next++;
 #ifdef DEBUG
-                       dprintf( "incr\n" );
+                       _glu_dprintf( "incr\n" );
 #endif
                        if( v2 == v2last ) {
 #ifdef DEBUG
-                           dprintf( "no good results\n" );
+                           _glu_dprintf( "no good results\n" );
 #endif
                            return 0; // ill-conditioned, guess answer
                        }
@@ -485,7 +485,7 @@ Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 )
            }
        } else {
 #ifdef DEBUG
-           dprintf( "case cd\n" );
+           _glu_dprintf( "case cd\n" );
 #endif
            if( v1next->param[0] < v2next->param[0] )
                return 0;
@@ -494,11 +494,11 @@ Subdivider::ccwTurn_tl( Arc_ptr j1, Arc_ptr j2 )
            else {
                v2 = v2next++;
 #ifdef DEBUG
-               dprintf( "incr\n" );
+               _glu_dprintf( "incr\n" );
 #endif
                if( v2 == v2last ) {
 #ifdef DEBUG
-                   dprintf( "no good results\n" );
+                   _glu_dprintf( "no good results\n" );
 #endif
                    return 0; // ill-conditioned, guess answer
                }

diff --git a/src/glu/sgi/libnurbs/internals/knotvector.cc b/src/glu/sgi/libnurbs/internals/knotvector.cc
index 50556f622dd44e76f4d9d1f0f62e82fa43fa54d1..610046674cd1adf3847aea92e950ada22c9f863d 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/knotvector.cc
+++ b/src/glu/sgi/libnurbs/internals/knotvector.cc
@@ -129,11 +129,11 @@ int Knotvector::validate( void )
 void Knotvector::show( char *msg )
 {
 #ifndef NDEBUG
-    dprintf( "%s\n", msg );
-    dprintf( "order = %ld, count = %ld\n", order, knotcount );
+    _glu_dprintf( "%s\n", msg );
+    _glu_dprintf( "order = %ld, count = %ld\n", order, knotcount );
 
     for( int i=0; i<knotcount; i++ )
-       dprintf( "knot[%d] = %g\n", i, knotlist[i] );
+       _glu_dprintf( "knot[%d] = %g\n", i, knotlist[i] );
 #endif
 }
 

diff --git a/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc b/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc
index 1a68ca51d91c885cefce529e1c24c4dcb3e3b19e..520bd419ea23fd0ba49cdbc551f34e9598cbfd16 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc
+++ b/src/glu/sgi/libnurbs/internals/nurbsinterfac.cc
@@ -232,7 +232,7 @@ NurbsTessellator::pwlcurve( long count, INREAL array[], long byte_stride, long t
        }
        if( i != count ) {
            do_nurbserror( 37 );
-           dprintf( "point %d (%f,%f)\n", i, x, y );
+           _glu_dprintf( "point %d (%f,%f)\n", i, x, y );
            isDataValid = 0;
            return;
        }
@@ -247,7 +247,7 @@ NurbsTessellator::pwlcurve( long count, INREAL array[], long byte_stride, long t
        }
        if( i != count ) {
            do_nurbserror( 37 );
-           dprintf( "point %d (%f,%f)\n", i, x, y );
+           _glu_dprintf( "point %d (%f,%f)\n", i, x, y );
            isDataValid = 0;
            return;
        }
@@ -460,7 +460,7 @@ NurbsTessellator::setnurbsproperty( long type, long purpose, INREAL *mat )
        mapdesc->setBboxsize( mat );
     } else {
 #ifndef NDEBUG
-        dprintf( "ERRORRORRORR!!!\n");
+        _glu_dprintf( "ERRORRORRORR!!!\n");
 #endif
     }
 }
@@ -488,7 +488,7 @@ NurbsTessellator::setnurbsproperty( long type, long purpose, INREAL *mat,
        mapdesc->setBmat( mat, rstride, cstride );
     } else {
 #ifndef NDEBUG
-        dprintf( "ERRORRORRORR!!!\n");
+        _glu_dprintf( "ERRORRORRORR!!!\n");
 #endif
     }
 }

diff --git a/src/glu/sgi/libnurbs/internals/nurbstess.cc b/src/glu/sgi/libnurbs/internals/nurbstess.cc
index 83c67fe834d5c726569a1ea7cdf66cdede5176b2..adf7c74626df46cfc4045234f730548814624bed 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/nurbstess.cc
+++ b/src/glu/sgi/libnurbs/internals/nurbstess.cc
@@ -35,8 +35,8 @@
 /*
  * nurbstess.c++
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/nurbstess.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.2 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/nurbstess.cc,v 1.2 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include "glimports.h"
@@ -79,7 +79,7 @@ void
 NurbsTessellator::makeobj( int )
 {
 #ifndef NDEBUG
-   dprintf( "makeobj\n" );
+   _glu_dprintf( "makeobj\n" );
 #endif
 }
 
@@ -87,7 +87,7 @@ void
 NurbsTessellator::closeobj( void )
 {
 #ifndef NDEBUG
-   dprintf( "closeobj\n" );
+   _glu_dprintf( "closeobj\n" );
 #endif
 }
 
@@ -95,7 +95,7 @@ void
 NurbsTessellator::bgnrender( void )
 {
 #ifndef NDEBUG
-   dprintf( "bgnrender\n" );
+   _glu_dprintf( "bgnrender\n" );
 #endif
 }
 
@@ -103,7 +103,7 @@ void
 NurbsTessellator::endrender( void )
 {
 #ifndef NDEBUG
-    dprintf( "endrender\n" );
+    _glu_dprintf( "endrender\n" );
 #endif
 }
 

diff --git a/src/glu/sgi/libnurbs/internals/patch.cc b/src/glu/sgi/libnurbs/internals/patch.cc
index dca20a85f21112fe00f98c5ec7e1d35a083ee119..4a524f1de27602afe60d4f18b3e39083772328f4 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/patch.cc
+++ b/src/glu/sgi/libnurbs/internals/patch.cc
@@ -35,8 +35,8 @@
 /*
  * patch.c++
  *
- * $Date: 2002/11/01 23:35:07 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/patch.cc,v 1.3 2002/11/01 23:35:07 brianp Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.4 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/patch.cc,v 1.4 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include <stdio.h>
@@ -439,7 +439,7 @@ Patch::getstepsize( void )
     }
 
 #ifdef DEBUG
-    dprintf( "sidesteps %g %g %g %g, stepsize %g %g\n",
+    _glu_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 );

diff --git a/src/glu/sgi/libnurbs/internals/quilt.cc b/src/glu/sgi/libnurbs/internals/quilt.cc
index 17d3c99142379fac86f8a9ae788942c3e8ebb941..f693b370ba87a6ca096be59b96f1cb64c925148c 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/quilt.cc
+++ b/src/glu/sgi/libnurbs/internals/quilt.cc
@@ -35,8 +35,8 @@
 /*
  * quilt.c++
  *
- * $Date: 2002/11/01 23:35:07 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/quilt.cc,v 1.2 2002/11/01 23:35:07 brianp Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.3 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/quilt.cc,v 1.3 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include "glimports.h"
@@ -91,12 +91,12 @@ Quilt::show( void )
     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" );
+               _glu_dprintf(  "%g ", ps[i*qspec[0].stride + j*qspec[1].stride + k] );
+           _glu_dprintf(  "\n" );
        }
-       dprintf(  "\n" );
+       _glu_dprintf(  "\n" );
     }
-    dprintf( "\n" );
+    _glu_dprintf( "\n" );
 #endif
 }
 

diff --git a/src/glu/sgi/libnurbs/internals/sorter.cc b/src/glu/sgi/libnurbs/internals/sorter.cc
index 876b34bf7d72e1a9cde7d0abf6cf497bd1f9ab91..bf13a68d72ac06c66b3c03d3192562cf1197d550 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/sorter.cc
+++ b/src/glu/sgi/libnurbs/internals/sorter.cc
@@ -35,8 +35,8 @@
 /*
  * sorter.c++
  *
- * $Date: 2001/11/29 16:16:55 $ $Revision: 1.2 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/sorter.cc,v 1.2 2001/11/29 16:16:55 kschultz Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.3 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/sorter.cc,v 1.3 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include "glimports.h"
@@ -57,7 +57,7 @@ Sorter::qsort( void *a, int n )
 int
 Sorter::qscmp( char *, char * )
 {
-    dprintf( "Sorter::qscmp: pure virtual called\n" );
+    _glu_dprintf( "Sorter::qscmp: pure virtual called\n" );
     return 0;
 }
 
@@ -65,14 +65,14 @@ Sorter::qscmp( char *, char * )
 void
 Sorter::qsexc( char *, char * )
 {
-    dprintf( "Sorter::qsexc: pure virtual called\n" );
+    _glu_dprintf( "Sorter::qsexc: pure virtual called\n" );
 }
 
 
 void
 Sorter::qstexc( char *, char *, char * )
 {
-    dprintf( "Sorter::qstexc: pure virtual called\n" );
+    _glu_dprintf( "Sorter::qstexc: pure virtual called\n" );
 }
 
 void

diff --git a/src/glu/sgi/libnurbs/internals/splitarcs.cc b/src/glu/sgi/libnurbs/internals/splitarcs.cc
index d28f755af5122b379001209b0c5644650c3c3c0d..716f6b9aae01ade916a65c8010dde68b7e12067a 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/splitarcs.cc
+++ b/src/glu/sgi/libnurbs/internals/splitarcs.cc
@@ -35,8 +35,8 @@
 /*
  * splitarcs.c++
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/splitarcs.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.2 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/splitarcs.cc,v 1.2 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include "glimports.h"
@@ -133,14 +133,14 @@ Subdivider::check_s( Arc_ptr jarc1, Arc_ptr jarc2 )
             undersampling */
     if( ! ( jarc1->tail()[0] < (jarc1)->head()[0] ) ) {
 #ifndef NDEBUG
-       dprintf( "s difference %f\n",  (jarc1)->tail()[0] - (jarc1)->head()[0] );
+       _glu_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] );
+       _glu_dprintf( "s difference %f\n",  (jarc2)->tail()[0] - (jarc2)->head()[0] );
 #endif
        ::mylongjmp( jumpbuffer, 28 );
     }
@@ -232,14 +232,14 @@ Subdivider::check_t( Arc_ptr jarc1, Arc_ptr jarc2 )
             undersampling */
     if( ! ( jarc1->tail()[1] < (jarc1)->head()[1] ) ) {
 #ifndef NDEBUG
-       dprintf( "t difference %f\n",  jarc1->tail()[1] - (jarc1)->head()[1] );
+       _glu_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] );
+       _glu_dprintf( "t difference %f\n",  jarc2->tail()[1] - (jarc2)->head()[1] );
 #endif
        ::mylongjmp( jumpbuffer, 28 );
     }

diff --git a/src/glu/sgi/libnurbs/internals/tobezier.cc b/src/glu/sgi/libnurbs/internals/tobezier.cc
index 4f1c02df59c8b3e8830e7cb89f31d2449eec1afe..95ef3b68b4f5df937ac3654942fa165880082657 100644 (file)
--- a/src/glu/sgi/libnurbs/internals/tobezier.cc
+++ b/src/glu/sgi/libnurbs/internals/tobezier.cc
@@ -35,8 +35,8 @@
 /* 
  * tobezier.c++
  *
- * $Date: 2001/03/17 00:25:41 $ $Revision: 1.1 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/tobezier.cc,v 1.1 2001/03/17 00:25:41 brianp Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.2 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/internals/tobezier.cc,v 1.2 2006/03/14 15:08:52 brianp Exp $
  */
 
 #include "glimports.h"
@@ -360,7 +360,7 @@ Knotspec::showpts( REAL *outpt )
            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] );
+           _glu_dprintf(  "show %g %g %g\n", outpt[0], outpt[1], outpt[2] );
     }
 }
 

diff --git a/src/glu/sgi/libnurbs/nurbtess/mystdio.h b/src/glu/sgi/libnurbs/nurbtess/mystdio.h
index df824f4fb8fe7aebe49e2998458fa7b00c0f09fa..a7594eecd6d948443abcf33b6cf0d463c6a71d57 100644 (file)
--- a/src/glu/sgi/libnurbs/nurbtess/mystdio.h
+++ b/src/glu/sgi/libnurbs/nurbtess/mystdio.h
@@ -35,28 +35,28 @@
 /*
  * mystdio.h
  *
- * $Date: 2001/03/19 17:52:03 $ $Revision: 1.3 $
- * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/mystdio.h,v 1.3 2001/03/19 17:52:03 pesco Exp $
+ * $Date: 2006/03/14 15:08:52 $ $Revision: 1.4 $
+ * $Header: /home/krh/git/sync/mesa-cvs-repo/Mesa/src/glu/sgi/libnurbs/nurbtess/mystdio.h,v 1.4 2006/03/14 15:08:52 brianp Exp $
  */
 
 #ifndef __glumystdio_h_
 #define __glumystdio_h_
 
 #ifdef STANDALONE
-inline void dprintf( char *, ... ) { }
+inline void _glu_dprintf( char *, ... ) { }
 #endif
 
 #ifdef LIBRARYBUILD
 #ifndef NDEBUG
 #include <stdio.h>
-#define dprintf printf
+#define _glu_dprintf printf
 #else
-inline void dprintf( char *, ... ) { }
+inline void _glu_dprintf( char *, ... ) { }
 #endif
 #endif
 
 #ifdef GLBUILD
-inline void dprintf( char *, ... ) { }
+inline void _glu_dprintf( char *, ... ) { }
 #endif
 
 #ifndef NULL