summaryrefslogtreecommitdiff
path: root/pyuno/source
diff options
context:
space:
mode:
authorDouglas Mencken <dougmencken@gmail.com>2015-10-01 12:06:58 -0400
committerMichael Stahl <mstahl@redhat.com>2015-10-09 21:02:02 +0000
commitf1e6e9e7ff739993f8a92cf268112f8be9769cbc (patch)
tree435a90a201762b48c7f1bf133f4ecdae37aa7752 /pyuno/source
parente695f173ccd3cd6c01c7191b98bb452fd387eb6d (diff)
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 <ci@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'pyuno/source')
-rw-r--r--pyuno/source/module/pyuno.cxx4
-rw-r--r--pyuno/source/module/pyuno_struct.cxx4
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 <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 b3413861cb55..b407426708d0 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;