diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 11:16:37 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2005-02-21 11:16:37 +0000 |
| commit | cb0c3d1b16f225b3017f09116bba2629aaffdaa8 (patch) | |
| tree | a192b673b640e21d8f6145430b485a5193b77bff /cppu | |
| parent | 0f9447c9f252540b158f5049cf559d0cdd1b0d43 (diff) | |
INTEGRATION: CWS sb29 (1.26.4); FILE MERGED
2005/02/02 12:33:58 sb 1.26.4.1: #i41893# Fixed test to run on unxsoli4.
Diffstat (limited to 'cppu')
| -rw-r--r-- | cppu/source/uno/data.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx index 9e4be22ad9e5..d1c65c288468 100644 --- a/cppu/source/uno/data.cxx +++ b/cppu/source/uno/data.cxx @@ -2,9 +2,9 @@ * * $RCSfile: data.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: kz $ $Date: 2005-01-21 16:48:49 $ + * last change: $Author: vg $ $Date: 2005-02-21 12:16:37 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -389,7 +389,9 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData( # pragma pack(8) #endif -#if defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) && defined(INTEL) +#if defined(INTEL) \ + && (defined(__GNUC__) && (defined(LINUX) || defined(FREEBSD)) \ + || defined(__SUNPRO_CC) && defined(SOLARIS)) #define MAX_ALIGNMENT_4 #endif |