cppu/source/uno/check.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 449cededd7f20b52e6bc417cd9351bfe3230cb05
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Tue Mar 22 14:42:34 2016 +0100
android version can also be compiled for x86
and x86 has smaller alignment than arm or a x86_64 host,
so needs the MAX_ALIGNMENT_4 to not trigger the static_asserts
Change-Id: I5643a33e4975e7bad20693f99fb8bbd5248c7c1c
diff --git a/cppu/source/uno/check.cxx b/cppu/source/uno/check.cxx
index 7fb8b36..f6f47e3 100644
--- a/cppu/source/uno/check.cxx
+++ b/cppu/source/uno/check.cxx
@@ -31,7 +31,8 @@
#if (defined(INTEL) \
&& (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || \
defined(NETBSD) || defined(OPENBSD) || \
- defined(DRAGONFLY) || defined(SOLARIS)) \
+ defined(DRAGONFLY) || defined(SOLARIS) || \
+ defined(ANDROID)) \
|| defined(MACOSX) )) \
|| defined(IOS)
#define MAX_ALIGNMENT_4
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
