[openvrml-commit] openvrml/src/libopenvrml-gl/openvrml/gl viewer.cpp, 1.43.2.3, 1.43.2.4

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv25068/src/libopenvrml-gl/openvrml/gl

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	viewer.cpp 
Log Message:
The Apple OpenGL framework seems to deviate from the GLU spec with respect to the type signature of the GLU tesselator callback function.  Even though Apple's glu.h header appears consistent with the specification, the compiler is quite insistent that the type signature of this callback is something other than what is reflected there.

Index: viewer.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v
retrieving revision 1.43.2.3
retrieving revision 1.43.2.4
diff -C2 -d -r1.43.2.3 -r1.43.2.4
*** viewer.cpp	9 Dec 2006 08:40:01 -0000	1.43.2.3
--- viewer.cpp	10 Dec 2006 07:26:23 -0000	1.43.2.4
***************
*** 1971,1975 ****
       * C linkage.
       */
!     typedef GLvoid (OPENVRML_GL_CALLBACK_* TessCB)();
  
      /**
--- 1971,1979 ----
       * C linkage.
       */
! # if HAVE_APPLE_OPENGL_FRAMEWORK
!     typedef GLvoid (*OPENVRML_GL_CALLBACK_ TessCB)(...);
! # else
!     typedef GLvoid (*OPENVRML_GL_CALLBACK_ TessCB)(GLvoid);
! # endif
  
      /**
***************
*** 2043,2047 ****
              gluTessCallback(&tesselator, GLU_TESS_VERTEX_DATA,
                              reinterpret_cast<TessCB>(tessExtrusionVertex));
!             gluTessCallback(&tesselator, GLU_TESS_END, glEnd);
  
              if (mask & viewer::mask_bottom) {
--- 2047,2052 ----
              gluTessCallback(&tesselator, GLU_TESS_VERTEX_DATA,
                              reinterpret_cast<TessCB>(tessExtrusionVertex));
!             gluTessCallback(&tesselator, GLU_TESS_END,
!                             reinterpret_cast<TessCB>(glEnd));
  
              if (mask & viewer::mask_bottom) {