--- oo_1.0.1_src/cppu/inc/cppu/macros.hxx.x86_64-cppu	2002-06-07 09:51:36.000000000 -0400
+++ oo_1.0.1_src/cppu/inc/cppu/macros.hxx	2002-10-15 08:01:12.000000000 -0400
@@ -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) || defined(POWERPC)) && (__GNUC__ == 3)
+#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC) || defined(X86_64)) && (__GNUC__ == 3)
 #define CPPU_GCC3_ALIGN( base_struct ) __attribute__ ((aligned (__alignof__ (base_struct))))
 #else
 #define CPPU_GCC3_ALIGN( base_struct )
--- oo_1.0.1_src/cppu/source/uno/data.cxx.x86_64-cppu	2002-06-07 09:57:10.000000000 -0400
+++ oo_1.0.1_src/cppu/source/uno/data.cxx	2002-10-18 15:49:02.000000000 -0400
@@ -307,7 +307,7 @@ sal_Bool SAL_CALL uno_assignData(
     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) || defined(POWERPC))
+#if defined(__GNUC__) && defined(LINUX) && (defined(INTEL) || defined(POWERPC) || defined(X86_64))
 #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(); }
@@ -451,9 +451,9 @@ BinaryCompatible_Impl::BinaryCompatible_
     BINTEST_VERIFY( sizeof(void *) >= sizeof(sal_Int32) );
     BINTEST_VERIFY( sizeof( Any ) == sizeof( uno_Any ) );
     BINTEST_VERIFY( sizeof( Any ) == sizeof( void * ) * 3 );
-    BINTEST_VERIFYOFFSET( Any, pType, 0 );
-    BINTEST_VERIFYOFFSET( Any, pData, 4 );
-    BINTEST_VERIFYOFFSET( Any, pReserved, 8 );
+    BINTEST_VERIFYOFFSET( Any, pType, 0 * sizeof( void * ) );
+    BINTEST_VERIFYOFFSET( Any, pData, 1 * sizeof( void * ) );
+    BINTEST_VERIFYOFFSET( Any, pReserved, 2 * sizeof( void * ) );
     // interface
     BINTEST_VERIFY( sizeof( Reference< XInterface > ) == sizeof( XInterface * ) );
     // string