Attachment #86640 for bug #92690

View | Details | Raw Unified | Return to bug 92690
Collapse All | Expand All

Lines 19891-19897 Link Here

(-)mozilla-plugin/configure (-1 / +1 lines)
19891	echo "${ECHO_T}no" >&6	19891	echo "${ECHO_T}no" >&6
19892	fi	19892	fi
19893		19893
19894	mozidldir="$mozprefix/share/idl/mozilla-$mozversion"	19894	mozidldir="/usr/lib/mozilla/idl"
19895	MOZILLA_XPIDLFLAGS="-I $mozidldir"	19895	MOZILLA_XPIDLFLAGS="-I $mozidldir"
19896		19896
19897		19897

Lines 29-35 Link Here

(-)mozilla-plugin/configure.ac (-1 / +1 lines)
29	AC_ARG_VAR([XPIDL], [Mozilla XPCOM IDL compiler])	29	AC_ARG_VAR([XPIDL], [Mozilla XPCOM IDL compiler])
30	AC_ARG_VAR([XPIDLFLAGS], [Mozilla XPCOM IDL compiler flags])	30	AC_ARG_VAR([XPIDLFLAGS], [Mozilla XPCOM IDL compiler flags])
31	AC_PATH_PROG([XPIDL], [xpidl], , ["$mozlibdir"])	31	AC_PATH_PROG([XPIDL], [xpidl], , ["$mozlibdir"])
32	mozidldir="$mozprefix/share/idl/mozilla-$mozversion"	32	mozidldir="/usr/lib/mozilla/idl"
33	MOZILLA_XPIDLFLAGS="-I $mozidldir"	33	MOZILLA_XPIDLFLAGS="-I $mozidldir"
34	AC_SUBST([mozlibdir])	34	AC_SUBST([mozlibdir])
35	AC_SUBST([MOZILLA_XPIDLFLAGS])	35	AC_SUBST([MOZILLA_XPIDLFLAGS])

Lines 34-40 Link Here

(-)mozilla-plugin/src/openvrml.cpp (-1 / +1 lines)
34	# include <nsMemory.h>	34	# include <nsMemory.h>
35	# include <nsString.h>	35	# include <nsString.h>
36	# include <nsIConsoleService.h>	36	# include <nsIConsoleService.h>
37	# include <nsIDOMWindow.h>	37	# include <dom/nsIDOMWindow.h>
38	# include <dom/nsIDOMWindowInternal.h>	38	# include <dom/nsIDOMWindowInternal.h>
39	# include <dom/nsIDOMLocation.h>	39	# include <dom/nsIDOMLocation.h>
40	# if defined MOZ_X11	40	# if defined MOZ_X11

Lines 28-37 Link Here

(-)src/libopenvrml/openvrml/field_value.h (+14 lines)
28	# include <stdexcept>	28	# include <stdexcept>
29	# include <string>	29	# include <string>
30	# include <typeinfo>	30	# include <typeinfo>
		31
		32	/* Ugly hack -- X headers define None as various kinds of 0,
		33	* and sometimes even as -1, but boost libraries define their
		34	* own type None; this file at one place expects None to be 0l
		35	*/
		36	#undef None
		37
31	# include <boost/cast.hpp>	38	# include <boost/cast.hpp>
32	# include <boost/concept_check.hpp>	39	# include <boost/concept_check.hpp>
33	# include <boost/shared_ptr.hpp>	40	# include <boost/shared_ptr.hpp>
34	# include <boost/utility.hpp>	41	# include <boost/utility.hpp>
		42
		43	/* Ugly hack -- X headers define None as various kinds of 0,
		44	* and sometimes even as -1, but boost libraries define their
		45	* own type None; this file at one place expects None to be 0l
		46	*/
		47	#define None 0l
		48
35	# include <openvrml/basetypes.h>	49	# include <openvrml/basetypes.h>
36	# include <openvrml/node_ptr.h>	50	# include <openvrml/node_ptr.h>
37		51

Return to bug 92690