From f1e6e9e7ff739993f8a92cf268112f8be9769cbc Mon Sep 17 00:00:00 2001 From: Douglas Mencken Date: Thu, 1 Oct 2015 12:06:58 -0400 Subject: 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 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 Reviewed-by: Michael Stahl Tested-by: Michael Stahl --- pyuno/source/module/pyuno.cxx | 4 ++-- pyuno/source/module/pyuno_struct.cxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pyuno/source/module/pyuno.cxx b/pyuno/source/module/pyuno.cxx index 9e9274abc8cb..8bd95f5e0253 100644 --- a/pyuno/source/module/pyuno.cxx +++ b/pyuno/source/module/pyuno.cxx @@ -22,8 +22,6 @@ #include #include -#include "pyuno_impl.hxx" - #include #include @@ -45,6 +43,8 @@ #include #include +#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 b3413861cb55..b407426708d0 100644 --- a/pyuno/source/module/pyuno_struct.cxx +++ b/pyuno/source/module/pyuno_struct.cxx @@ -22,8 +22,6 @@ #include #include -#include "pyuno_impl.hxx" - #include #include @@ -32,6 +30,8 @@ #include +#include "pyuno_impl.hxx" + using com::sun::star::uno::Sequence; using com::sun::star::uno::Reference; using com::sun::star::uno::XInterface; -- cgit