Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1093/mozilla-plugin/src/openvrml-player
Modified Files:
player.cpp
Log Message:
Include OpenVRML headers before X11 headers. This avoids a conflict between the X11 headers and Boost headers.
Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/player.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** player.cpp 30 Oct 2005 03:20:17 -0000 1.13
--- player.cpp 27 Nov 2005 07:11:36 -0000 1.14
***************
*** 26,29 ****
--- 26,31 ----
# include <boost/thread/mutex.hpp>
# include <boost/thread/thread.hpp>
+ # include <openvrml/browser.h>
+ # include <openvrml/gl/viewer.h>
# include <unistd.h>
# include <argp.h>
***************
*** 32,37 ****
# include <gtk/gtk.h>
# include <gtk/gtkgl.h>
- # include <openvrml/browser.h>
- # include <openvrml/gl/viewer.h>
namespace {
--- 34,37 ----
|
