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.
This commit is contained in:
Vladimir Glazounov
2005-02-21 11:16:37 +00:00
parent 0f9447c9f2
commit cb0c3d1b16

View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: data.cxx,v $ * $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 * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -389,7 +389,9 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
# pragma pack(8) # pragma pack(8)
#endif #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 #define MAX_ALIGNMENT_4
#endif #endif