added GLCALLBACKPCAST for Cygnus (Sven Panne)

1 files changed, 27 insertions, 32 deletions

diff --git a/src/glu/mesa/tess.c b/src/glu/mesa/tess.c
index 4f91d135e85..919643cb8e2 100644
--- a/src/glu/mesa/tess.c
+++ b/src/glu/mesa/tess.c
@@ -1,10 +1,10 @@
-/* $Id: tess.c,v 1.23 2000/01/20 21:52:01 gareth Exp $ */
+/* $Id: tess.c,v 1.24 2000/02/10 17:45:52 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  *
- * Copyright (C) 1999  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2000  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"),
@@ -83,19 +83,19 @@ void tess_error_callback( GLUtesselator *tobj, GLenum errnum )
  *****************************************************************************/
 static void init_callbacks( tess_callbacks_t *callbacks )
 {
-    callbacks->begin        = ( void (GLCALLBACKP)(GLenum) ) NULL;
-    callbacks->beginData    = ( void (GLCALLBACKP)(GLenum, void *) ) NULL;
-    callbacks->edgeFlag     = ( void (GLCALLBACKP)(GLboolean) ) NULL;
-    callbacks->edgeFlagData = ( void (GLCALLBACKP)(GLboolean, void *) ) NULL;
-    callbacks->vertex       = ( void (GLCALLBACKP)(void *) ) NULL;
-    callbacks->vertexData   = ( void (GLCALLBACKP)(void *, void *) ) NULL;
-    callbacks->end          = ( void (GLCALLBACKP)(void) ) NULL;
-    callbacks->endData      = ( void (GLCALLBACKP)(void *) ) NULL;
-    callbacks->error        = ( void (GLCALLBACKP)(GLenum) ) NULL;
-    callbacks->errorData    = ( void (GLCALLBACKP)(GLenum, void *) ) NULL;
-    callbacks->combine      = ( void (GLCALLBACKP)(GLdouble [3], void *[4],
+    callbacks->begin        = ( void (GLCALLBACKPCAST)(GLenum) ) NULL;
+    callbacks->beginData    = ( void (GLCALLBACKPCAST)(GLenum, void *) ) NULL;
+    callbacks->edgeFlag     = ( void (GLCALLBACKPCAST)(GLboolean) ) NULL;
+    callbacks->edgeFlagData = ( void (GLCALLBACKPCAST)(GLboolean, void *) ) NULL;
+    callbacks->vertex       = ( void (GLCALLBACKPCAST)(void *) ) NULL;
+    callbacks->vertexData   = ( void (GLCALLBACKPCAST)(void *, void *) ) NULL;
+    callbacks->end          = ( void (GLCALLBACKPCAST)(void) ) NULL;
+    callbacks->endData      = ( void (GLCALLBACKPCAST)(void *) ) NULL;
+    callbacks->error        = ( void (GLCALLBACKPCAST)(GLenum) ) NULL;
+    callbacks->errorData    = ( void (GLCALLBACKPCAST)(GLenum, void *) ) NULL;
+    callbacks->combine      = ( void (GLCALLBACKPCAST)(GLdouble [3], void *[4],
 						   GLfloat [4], void **) ) NULL;
-    callbacks->combineData  = ( void (GLCALLBACKP)(GLdouble [3], void *[4],
+    callbacks->combineData  = ( void (GLCALLBACKPCAST)(GLdouble [3], void *[4],
 						   GLfloat [4], void **,
 						   void *) ) NULL;
 }
@@ -883,55 +883,50 @@ void GLAPIENTRY gluTessCallback( GLUtesselator *tobj, GLenum which,
     {
 	/* Register the begin callbacks. */
     case GLU_TESS_BEGIN:
-	tobj->callbacks.begin = (void (GLCALLBACKP)(GLenum)) fn;
+	tobj->callbacks.begin = (void (GLCALLBACKPCAST)(GLenum)) fn;
 	break;
     case GLU_TESS_BEGIN_DATA:
-	tobj->callbacks.beginData = (void (GLCALLBACKP)(GLenum, void *)) fn;
+	tobj->callbacks.beginData = (void (GLCALLBACKPCAST)(GLenum, void *)) fn;
 	break;
 
 	/* Register the edge flag callbacks. */
     case GLU_TESS_EDGE_FLAG:
-	tobj->callbacks.edgeFlag = (void (GLCALLBACKP)(GLboolean)) fn;
+	tobj->callbacks.edgeFlag = (void (GLCALLBACKPCAST)(GLboolean)) fn;
 	break;
     case GLU_TESS_EDGE_FLAG_DATA:
-	tobj->callbacks.edgeFlagData =
-	    (void (GLCALLBACKP)(GLboolean, void *)) fn;
+	tobj->callbacks.edgeFlagData = (void (GLCALLBACKPCAST)(GLboolean, void *)) fn;
 	break;
 
 	/* Register the vertex callbacks. */
     case GLU_TESS_VERTEX:
-	tobj->callbacks.vertex = (void (GLCALLBACKP)(void *)) fn;
+	tobj->callbacks.vertex = (void (GLCALLBACKPCAST)(void *)) fn;
 	break;
     case GLU_TESS_VERTEX_DATA:
-	tobj->callbacks.vertexData = (void (GLCALLBACKP)(void *, void *)) fn;
+	tobj->callbacks.vertexData = (void (GLCALLBACKPCAST)(void *, void *)) fn;
 	break;
 
 	/* Register the end callbacks. */
     case GLU_TESS_END:
-	tobj->callbacks.end = (void (GLCALLBACKP)(void)) fn;
+	tobj->callbacks.end = (void (GLCALLBACKPCAST)(void)) fn;
 	break;
     case GLU_TESS_END_DATA:
-	tobj->callbacks.endData = (void (GLCALLBACKP)(void *)) fn;
+	tobj->callbacks.endData = (void (GLCALLBACKPCAST)(void *)) fn;
 	break;
 
 	/* Register the error callbacks. */
     case GLU_TESS_ERROR:
-	tobj->callbacks.error = (void (GLCALLBACKP)(GLenum)) fn;
+	tobj->callbacks.error = (void (GLCALLBACKPCAST)(GLenum)) fn;
 	break;
     case GLU_TESS_ERROR_DATA:
-	tobj->callbacks.errorData = (void (GLCALLBACKP)(GLenum, void *)) fn;
+	tobj->callbacks.errorData = (void (GLCALLBACKPCAST)(GLenum, void *)) fn;
 	break;
 
 	/* Register the combine callbacks. */
     case GLU_TESS_COMBINE:
-	tobj->callbacks.combine =
-	    (void (GLCALLBACKP)(GLdouble[3], void *[4],
-				GLfloat [4], void **)) fn;
+	tobj->callbacks.combine = (void (GLCALLBACKPCAST)(GLdouble[3], void *[4], GLfloat [4], void **)) fn;
 	break;
     case GLU_TESS_COMBINE_DATA:
-	tobj->callbacks.combineData =
-	    (void (GLCALLBACKP)(GLdouble[3], void *[4], GLfloat [4],
-				void **, void *)) fn;
+	tobj->callbacks.combineData = (void (GLCALLBACKPCAST)(GLdouble[3], void *[4], GLfloat [4], void **, void *)) fn;
 	break;
 
     default: