diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-03-22 14:42:34 +0100 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2016-03-22 14:44:53 +0100 |
| commit | 449cededd7f20b52e6bc417cd9351bfe3230cb05 (patch) | |
| tree | 768103811c9e0dea069271795506eb06c45d3c16 /cppu | |
| parent | e3428225160923ecbc36e44a94389d8f44ab225d (diff) | |
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
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/uno/check.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cppu/source/uno/check.cxx b/cppu/source/uno/check.cxx index 7fb8b36f79b4..f6f47e316f97 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 |