summaryrefslogtreecommitdiff
path: root/cppu
diff options
context:
space:
mode:
authorMartin Hollmichel <mh@openoffice.org>2002-10-02 12:17:56 +0000
committerMartin Hollmichel <mh@openoffice.org>2002-10-02 12:17:56 +0000
commitd45d59e6a0da50c27afebbbdef49106205620720 (patch)
treeeb0d971a50a9387906b801cd21baf5259063bb1d /cppu
parentbdd706cec81500826489a7ff6668dd73701ba003 (diff)
join: from SRX643_OO, #103821#
Diffstat (limited to 'cppu')
-rw-r--r--cppu/inc/cppu/macros.hxx6
-rw-r--r--cppu/source/uno/data.cxx6
2 files changed, 6 insertions, 6 deletions
diff --git a/cppu/inc/cppu/macros.hxx b/cppu/inc/cppu/macros.hxx
index 972f744ebdf7..994310e7d4db 100644
--- a/cppu/inc/cppu/macros.hxx
+++ b/cppu/inc/cppu/macros.hxx
@@ -2,9 +2,9 @@
*
* $RCSfile: macros.hxx,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: dbo $ $Date: 2001-10-29 15:25:29 $
+ * last change: $Author: mh $ $Date: 2002-10-02 13:17:56 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -76,7 +76,7 @@
the struct inherits from a base struct the first member is no double or [unsigned] long long.
@internal
*/
-#if defined(__GNUC__) && defined(LINUX) && defined(INTEL) && (__GNUC__ == 3)
+#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC)) && (__GNUC__ == 3)
#define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct))))
#else
#define CPPU_GCC3_ALIGN( base_struct )
diff --git a/cppu/source/uno/data.cxx b/cppu/source/uno/data.cxx
index 32cf1c224aa1..179d08d5cd91 100644
--- a/cppu/source/uno/data.cxx
+++ b/cppu/source/uno/data.cxx
@@ -2,9 +2,9 @@
*
* $RCSfile: data.cxx,v $
*
- * $Revision: 1.18 $
+ * $Revision: 1.19 $
*
- * last change: $Author: dbo $ $Date: 2002-08-21 09:19:25 $
+ * last change: $Author: mh $ $Date: 2002-10-02 13:15:50 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -365,7 +365,7 @@ sal_Bool SAL_CALL uno_type_isAssignableFromData(
if (OFFSET_OF(s, m) != n) { fprintf( stderr, "### OFFSET_OF(" #s ", " #m ") = %d instead of expected %d!!!\n", OFFSET_OF(s, m), n ); abort(); }
#ifdef DEBUG
-#if defined(__GNUC__) && defined(LINUX) && defined(INTEL)
+#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC))
#define BINTEST_VERIFYSIZE( s, n ) \
fprintf( stderr, "> sizeof(" #s ") = %d; __alignof__ (" #s ") = %d\n", sizeof(s), __alignof__ (s) ); \
if (sizeof(s) != n) { fprintf( stderr, "### sizeof(" #s ") = %d instead of expected %d!!!\n", sizeof(s), n ); abort(); }