diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 12:12:06 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 12:12:06 +0000 |
| commit | 86ec15770f0e6bbd1dd8e7d9d898702143e34e31 (patch) | |
| tree | 8004de648994f25ebe54305c8f916d88418ac276 /tools/source | |
| parent | 9e1db56a6f3cbc2ac36e6a53ba20569841e3b745 (diff) | |
INTEGRATION: CWS ooo64bit01 (1.2.200); FILE MERGED
2004/03/15 23:18:46 fa 1.2.200.1: First bits of 64-bitness. #i25651# & more
Diffstat (limited to 'tools/source')
| -rw-r--r-- | tools/source/memtools/mempool.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/source/memtools/mempool.cxx b/tools/source/memtools/mempool.cxx index 6a4dbc9010f9..aad416ad6bd3 100644 --- a/tools/source/memtools/mempool.cxx +++ b/tools/source/memtools/mempool.cxx @@ -2,9 +2,9 @@ * * $RCSfile: mempool.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: mhu $ $Date: 2002-05-21 20:30:47 $ + * last change: $Author: rt $ $Date: 2004-06-17 13:12:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,8 +68,8 @@ // ----------------------------------------------------------------------- -#if ( __ALIGNMENT8 > 4 ) -#define MEMPOOL_ALIGNMENT __ALIGNMENT8 +#if ( SAL_TYPES_ALIGNMENT8 > 4 ) +#define MEMPOOL_ALIGNMENT SAL_TYPES_ALIGNMENT8 #else #define MEMPOOL_ALIGNMENT 4 #endif @@ -87,7 +87,7 @@ struct FixedMemBlock USHORT nFirst; USHORT nDummyAlign1; FixedMemBlock* pNext; -#if (__SIZEOFPOINTER == 4) && (__ALIGNMENT8 == 8) +#if (SAL_TYPES_SIZEOFPOINTER == 4) && (SAL_TYPES_ALIGNMENT8 == 8) void* pDummyAlign2; #endif char aData[1]; |