[openvrml-commit] openvrml/src/libopenvrml-gl/openvrml/gl viewer.cpp, 1.43.2.14, 1.43.2.15

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

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

Modified Files:
      Tag: OpenVRML-0_16-BRANCH
	viewer.cpp 
Log Message:
Check to see whether HAVE_WINDOWS_H and HAVE_APPLE_OPENGL_FRAMEWORK are defined.

Index: viewer.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl/viewer.cpp,v
retrieving revision 1.43.2.14
retrieving revision 1.43.2.15
diff -C2 -d -r1.43.2.14 -r1.43.2.15
*** viewer.cpp	31 May 2007 07:59:16 -0000	1.43.2.14
--- viewer.cpp	9 Jul 2007 07:37:44 -0000	1.43.2.15
***************
*** 30,34 ****
  # endif
  
! # if HAVE_WINDOWS_H && defined(_WIN32)
  #   include <windows.h>
  # endif
--- 30,34 ----
  # endif
  
! # if defined(HAVE_WINDOWS_H) && defined(_WIN32)
  #   include <windows.h>
  # endif
***************
*** 37,41 ****
  # endif
  
! # if HAVE_APPLE_OPENGL_FRAMEWORK
  #   include <OpenGL/gl.h>
  #   include <OpenGL/glu.h>
--- 37,41 ----
  # endif
  
! # ifdef HAVE_APPLE_OPENGL_FRAMEWORK
  #   include <OpenGL/gl.h>
  #   include <OpenGL/glu.h>
***************
*** 1967,1971 ****
       * C linkage.
       */
! # if HAVE_APPLE_OPENGL_FRAMEWORK
      typedef GLvoid (OPENVRML_GL_CALLBACK_* TessCB)(...);
  # else
--- 1967,1971 ----
       * C linkage.
       */
! # ifdef HAVE_APPLE_OPENGL_FRAMEWORK
      typedef GLvoid (OPENVRML_GL_CALLBACK_* TessCB)(...);
  # else