summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorPedro Giffuni <pfg@apache.org>2015-11-25 16:55:51 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-11-25 20:59:45 +0000
commitc6dbbdf851911e0e3ae424245f1e088a3e689141 (patch)
tree590a3d37d6354548a1a0d10cfe8ab2e89ccf6701 /cppu
parentd5443023effb6231496f1231026bcd040d311408 (diff)
i125711 - Illumos port: generalize MAX_ALIGNMENT for Solaris
GCC in Ilumos appears to behave exactly like the Solaris SUNPRO compiler so generalize the case for Solaris. (cherry picked from commit e1da117c49fc02af9543e32526bf1c04657534c4) Change-Id: I3fa619f34c35608b187c3aa394552ac78c3f0c20
Diffstat (limited to 'cppu')
-rw-r--r--cppu/source/uno/data.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index ed0ebdd292c2..f0da767cd4b5 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -333,8 +333,10 @@ namespace cppu {
// <sal/typesizes.h> ?
#if (defined(INTEL) \
- && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || defined(NETBSD) || defined(OPENBSD)) \
- || defined(MACOSX) || defined(DRAGONFLY))) \
+ && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD) || \
+ defined(NETBSD) || defined(OPENBSD) || \
+ defined(DRAGONFLY) || defined(SOLARIS)) \
+ || defined(MACOSX) )) \
|| defined(IOS)
#define MAX_ALIGNMENT_4
#endif