MATH_DEBUG changes from bug #4468.

5 files changed, 10 insertions, 11 deletions

diff --git a/src/mesa/math/m_debug_clip.c b/src/mesa/math/m_debug_clip.c
index ae8108b88a1..334f3ef0302 100644
--- a/src/mesa/math/m_debug_clip.c
+++ b/src/mesa/math/m_debug_clip.c
@@ -41,7 +41,7 @@
 static char dummy;
 #endif
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 static clip_func *clip_tab[2] = {
    _mesa_clip_tab,
@@ -368,4 +368,4 @@ void _math_test_all_cliptest_functions( char *description )
 }
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
diff --git a/src/mesa/math/m_debug_norm.c b/src/mesa/math/m_debug_norm.c
index 9bb46598158..11cae6bba7a 100644
--- a/src/mesa/math/m_debug_norm.c
+++ b/src/mesa/math/m_debug_norm.c
@@ -43,7 +43,7 @@
 static char dummy;
 #endif
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 
 static int m_norm_identity[16] = {
@@ -375,10 +375,9 @@ void _math_test_all_normal_transform_functions( char *description )
 #ifdef RUN_DEBUG_BENCHMARK
    if ( mesa_profile ) {
       _mesa_printf( "\n" );
-      fflush( stdout );
    }
 #endif
 }
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
diff --git a/src/mesa/math/m_debug_util.h b/src/mesa/math/m_debug_util.h
index 1b7d742a80b..f7ce4679b6d 100644
--- a/src/mesa/math/m_debug_util.h
+++ b/src/mesa/math/m_debug_util.h
@@ -29,7 +29,7 @@
 #define __M_DEBUG_UTIL_H__
 
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 
 /* Comment this out to deactivate the cycle counter.
@@ -315,6 +315,6 @@ enum { NIL = 0, ONE = 1, NEG = -1, VAR = 2 };
 #endif
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
 
 #endif /* __M_DEBUG_UTIL_H__ */
diff --git a/src/mesa/math/m_debug_xform.c b/src/mesa/math/m_debug_xform.c
index feed539eacb..2af837cf64b 100644
--- a/src/mesa/math/m_debug_xform.c
+++ b/src/mesa/math/m_debug_xform.c
@@ -42,7 +42,7 @@
 static char dummy;
 #endif
 
-#ifdef DEBUG  /* This code only used for debugging */
+#ifdef DEBUG_MATH  /* This code only used for debugging */
 
 
 /* Overhead of profiling counter in cycles.  Automatically adjusted to
@@ -335,4 +335,4 @@ void _math_test_all_transform_functions( char *description )
 }
 
 
-#endif /* DEBUG */
+#endif /* DEBUG_MATH */
diff --git a/src/mesa/math/m_xform.c b/src/mesa/math/m_xform.c
index 5366e34989c..fa3f57a8e5a 100644
--- a/src/mesa/math/m_xform.c
+++ b/src/mesa/math/m_xform.c
@@ -43,7 +43,7 @@
 #include "mathmod.h"
 
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
 #include "m_debug.h"
 #endif
 
@@ -204,7 +204,7 @@ _math_init_transformation( void )
    init_copy0();
    init_dotprod();
 
-#ifdef DEBUG
+#ifdef DEBUG_MATH
    _math_test_all_transform_functions( "default" );
    _math_test_all_normal_transform_functions( "default" );
    _math_test_all_cliptest_functions( "default" );