summaryrefslogtreecommitdiff
path: root/cppu/source/uno/data.cxx
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-02-03 16:32:32 +0000
committerKurt Zenker <kz@openoffice.org>2006-02-03 16:32:32 +0000
commit277b2a1d4b99e7da38595892cb74b53d68a60694 (patch)
treee0fedc62a973f5254919068b1a167ecb60ca43ca /cppu/source/uno/data.cxx
parentbfa7db2a26a0404493d52d8dde72ce6795c12abc (diff)
INTEGRATION: CWS macintel01 (1.28.32); FILE MERGED
2006/01/21 20:45:22 ericb 1.28.32.1: #i60956# add Mac OS X for Intel cpu for alignment
Diffstat (limited to 'cppu/source/uno/data.cxx')
-rw-r--r--cppu/source/uno/data.cxx6
1 files changed, 3 insertions, 3 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 4c00c4d79a58..e5abaa3ffc4b 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: data.cxx,v $
*
- * $Revision: 1.28 $
+ * $Revision: 1.29 $
*
- * last change: $Author: rt $ $Date: 2005-09-08 08:51:46 $
+ * last change: $Author: kz $ $Date: 2006-02-03 17:32:32 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -364,7 +364,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
#endif
#if defined(INTEL) \
- && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) \
+ && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) || defined(MACOSX) \
|| defined(__SUNPRO_CC) && defined(SOLARIS))
#define MAX_ALIGNMENT_4
#endif