. More Watcom C++ warnings fixed in Mesa.

[mesa.git] / src / glu / mesa / tess.h

diff --git a/src/glu/mesa/tess.h b/src/glu/mesa/tess.h
index 92b8a4131cef62eed1176fd4a9e0b74f97eecf80..504ebd0872f1a6110a9497d086a25b3b6789989f 100644 (file)
--- a/src/glu/mesa/tess.h
+++ b/src/glu/mesa/tess.h
@@ -1,4 +1,4 @@
-/* $Id: tess.h,v 1.9 1999/10/03 00:56:07 gareth Exp $ */
+/* $Id: tess.h,v 1.15 1999/11/05 20:37:14 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -24,31 +24,9 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
-/*
- * $Log: tess.h,v $
- * Revision 1.9  1999/10/03 00:56:07  gareth
- * Added tessellation winding rule support.  Misc bug fixes.
- *
- * Revision 1.8  1999/09/17 06:31:02  gareth
- * Winding rule updates.
- *
- * Revision 1.7  1999/09/16 06:42:01  gareth
- * Misc winding rule bug fixes.
- *
- * Revision 1.6  1999/09/15 02:12:16  gareth
- * Added debugging pragma message.
- *
- * Revision 1.5  1999/09/14 22:46:02  gareth
- * Added debugging output.
- *
- * Revision 1.4  1999/09/13 22:20:13  gareth
- * Fixed file headers.  Tracking down macro bugs.
- *
- */
-
 /*****************************************************************************
  *
- * GLU 1.3 Polygon Tessellation by Gareth Hughes <garethh@lucent.com>
+ * GLU 1.3 Polygon Tessellation by Gareth Hughes <garethh@bell-labs.com>
  *
  *****************************************************************************/
 
@@ -61,6 +39,7 @@
 #include "gluP.h"
 
 #include "tess_typedefs.h"
+#include "tess_macros.h"
 #include "tess_hash.h"
 #include "tess_heap.h"
 #if 0
@@ -92,7 +71,8 @@ struct GLUtesselator
 #endif
     heap_t             *ears;
     hashtable_t                *cvc_lists;
-    void               *user_data;
+    void               *data;
+    GLboolean          edge_flag;
     GLuint             label;
     GLenum             error;
 };
@@ -105,31 +85,38 @@ extern void tess_error_callback( GLUtesselator *, GLenum );
 
 
 /*****************************************************************************
- * Debugging output:  (to be removed...)
+ * Debugging output:
  *****************************************************************************/
 #ifdef DEBUG
-extern int     tess_debug_level;
-int vdebugstr( char *format_str, ... );
-
-#pragma message( "tess: using DEBUGP for debugging output" )
-#define DEBUGP( level, body )                                          \
-    do {                                                               \
-       if ( tess_debug_level >= level ) {                              \
-           vdebugstr( "%11.11s:%-5d ", __FILE__, __LINE__, level );    \
-           vdebugstr body;                                             \
-           fflush( stderr );                                           \
-       }                                                               \
-    } while ( 0 )
-#define DEBUGIF( level )       do { if ( tess_debug_level >= level ) {
-#define DEBUGENDIF             } } while ( 0 )
+extern int     tess_dbg_level;
+
+#define DBG_LEVEL_BASE         1
+#define DBG_LEVEL_VERBOSE      10
+#define DBG_LEVEL_ENTEREXIT    20
 
+#ifdef _WIN32
+#define DBG_STREAM     stdout
 #else
+#define DBG_STREAM     stderr
+#endif
 
-#define DEBUGP( level, body )
-#define DEBUGIF( level )       while(0) {
-#define DEBUGENDIF             }
+#ifdef __GNUC__
+#define MSG( level, format, args... )                                  \
+    if ( level <= tess_dbg_level ) {                                   \
+       fprintf( DBG_STREAM, "%9.9s:%d:\t ", __FILE__, __LINE__ );      \
+       fprintf( DBG_STREAM, format, ## args );                         \
+       fflush( DBG_STREAM );                                           \
+    }
+#else
+#define MSG            tess_msg
+#endif /* __GNUC__ */
 
-#endif
+#else
+#define MSG            tess_msg
+#endif /* DEBUG */
+
+extern INLINE void tess_msg( int level, char *format, ... );
+extern INLINE void tess_info( char *file, char *line );
 
 #ifdef __cplusplus
 }