1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00

Fix build with Boost 1.33.0 by moving a conflicting boost headers a bit

up. The conflicting symbol was "None", which is definied in

${LOCALBASE}/include/boost/numeric/conversion/detail/converter.hpp and
${X11BASE}/include/X11/X.h

Reported by:	pointyhat via kris
This commit is contained in:
Simon Barner 2005-11-15 09:34:34 +00:00
parent 12bce07b1b
commit e24f4f30df
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=148348

View File

@ -0,0 +1,19 @@
--- mozilla-plugin/src/openvrml-player/player.cpp.orig Tue Nov 15 00:16:02 2005
+++ mozilla-plugin/src/openvrml-player/player.cpp Tue Nov 15 00:21:07 2005
@@ -22,14 +22,14 @@
# include <boost/lexical_cast.hpp>
# include <boost/spirit.hpp>
# include <boost/spirit/phoenix.hpp>
+# include <openvrml/browser.h>
+# include <openvrml/gl/viewer.h>
# include <unistd.h>
# include <argp.h>
# include <X11/keysym.h>
# include <gdk/gdkx.h>
# include <gtk/gtk.h>
# include <gtk/gtkgl.h>
-# include <openvrml/browser.h>
-# include <openvrml/gl/viewer.h>
namespace {