. 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 fe8296c976cb2f1973ad4e84b53947aaf878d9e3..504ebd0872f1a6110a9497d086a25b3b6789989f 100644 (file)
--- a/src/glu/mesa/tess.h
+++ b/src/glu/mesa/tess.h
@@ -1,21 +1,21 @@
-/* $Id: tess.h,v 1.2 1999/09/10 02:03:31 gareth Exp $ */
+/* $Id: tess.h,v 1.15 1999/11/05 20:37:14 gareth Exp $ */
 
 /*
  * Mesa 3-D graphics library
  * Version:  3.1
- * 
+ *
  * Copyright (C) 1999  Brian Paul   All Rights Reserved.
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
  * to deal in the Software without restriction, including without limitation
  * the rights to use, copy, modify, merge, publish, distribute, sublicense,
  * and/or sell copies of the Software, and to permit persons to whom the
  * Software is furnished to do so, subject to the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
@@ -26,7 +26,7 @@
 
 /*****************************************************************************
  *
- * GLU 1.3 Polygon Tessellation by Gareth Hughes <garethh@lucent.com>
+ * GLU 1.3 Polygon Tessellation by Gareth Hughes <garethh@bell-labs.com>
  *
  *****************************************************************************/
 
@@ -39,6 +39,8 @@
 #include "gluP.h"
 
 #include "tess_typedefs.h"
+#include "tess_macros.h"
+#include "tess_hash.h"
 #include "tess_heap.h"
 #if 0
 #include "tess_grid.h"
@@ -67,7 +69,11 @@ struct GLUtesselator
 #if 0
     tess_grid_t                *grid;                  /* Not currently used... */
 #endif
-    heap_t             *heap;
+    heap_t             *ears;
+    hashtable_t                *cvc_lists;
+    void               *data;
+    GLboolean          edge_flag;
+    GLuint             label;
     GLenum             error;
 };
 
@@ -75,34 +81,45 @@ struct GLUtesselator
 /*****************************************************************************
  * Tessellation error handler:
  *****************************************************************************/
-extern void tess_error_callback( GLUtesselator *, GLenum, void * );
+extern void tess_error_callback( GLUtesselator *, GLenum );
 
 
 /*****************************************************************************
- * Debugging output:  (to be removed...)
+ * Debugging output:
  *****************************************************************************/
-extern int     tess_debug_level;
-int vdebugstr( char *format_str, ... );
-
-#ifdef _DEBUG
-#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 )
+#ifdef DEBUG
+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 DEBUGP(level, body)
-#define DEBUGIF(level)         while(0) {
-#define DEBUGENDIF             }
+#define DBG_STREAM     stderr
 #endif
 
+#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__ */
+
+#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
 }
 #endif
 
-#endif // __GLU_TESS_H__
+#endif /* __GLU_TESS_H__ */