Update of /cvsroot/openvrml/openvrml/src/libopenvrml-gl/openvrml/gl
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv24727/src/libopenvrml-gl/openvrml/gl
Modified Files:
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.63
retrieving revision 1.64
diff -C2 -d -r1.63 -r1.64
*** viewer.cpp 1 Jul 2007 03:01:29 -0000 1.63
--- viewer.cpp 1 Jul 2007 03:11:31 -0000 1.64
***************
*** 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>
***************
*** 1979,1983 ****
* C linkage.
*/
! # if HAVE_APPLE_OPENGL_FRAMEWORK
typedef GLvoid (OPENVRML_GL_CALLBACK_* TessCB)(...);
# else
--- 1979,1983 ----
* C linkage.
*/
! # ifdef HAVE_APPLE_OPENGL_FRAMEWORK
typedef GLvoid (OPENVRML_GL_CALLBACK_* TessCB)(...);
# else
|
