pyuno/source/module/pyuno.cxx | 4 ++-- pyuno/source/module/pyuno_struct.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit f1e6e9e7ff739993f8a92cf268112f8be9769cbc Author: Douglas Mencken <[email protected]> Date: Thu Oct 1 12:06:58 2015 -0400 fix build by moving python-related includes below others This fixes build errors like "macro (...) passed 2 arguments, but takes just 1" The reason is a conflict between tolower() etc. as a set of functions from <ios> and a hacky fix in Python's include pyport.h which tries to undefine tolower() and then redefine it Change-Id: I82e5ac19b70912d09d5e3a34c93eddc08cec9260 Reviewed-on: https://gerrit.libreoffice.org/19082 Tested-by: Jenkins <[email protected]> Reviewed-by: Michael Stahl <[email protected]> Tested-by: Michael Stahl <[email protected]> diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index 9e9274ab..8bd95f5 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -22,8 +22,6 @@ #include <algorithm> #include <cassert> -#include "pyuno_impl.hxx" - #include <rtl/strbuf.hxx> #include <rtl/ustrbuf.hxx> @@ -45,6 +43,8 @@ #include <com/sun/star/container/XNameContainer.hpp> #include <com/sun/star/container/XNameReplace.hpp> +#include "pyuno_impl.hxx" + using com::sun::star::uno::Sequence; using com::sun::star::uno::Reference; using com::sun::star::uno::XInterface; diff --git a/pyuno/source/module/pyuno_struct.cxx b/pyuno/source/module/pyuno_struct.cxx index b341386..b407426 100644 --- a/pyuno/source/module/pyuno_struct.cxx +++ b/pyuno/source/module/pyuno_struct.cxx @@ -22,8 +22,6 @@ #include <algorithm> #include <cassert> -#include "pyuno_impl.hxx" - #include <rtl/strbuf.hxx> #include <osl/diagnose.h> @@ -32,6 +30,8 @@ #include <com/sun/star/beans/XMaterialHolder.hpp> +#include "pyuno_impl.hxx" + using com::sun::star::uno::Sequence; using com::sun::star::uno::Reference; using com::sun::star::uno::XInterface; _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
