diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 12:11:39 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-06-17 12:11:39 +0000 |
| commit | cebcb0aa9cc881452d21adba4764d12f3042826a (patch) | |
| tree | fb4d1f784f4c69e63592dedf435f99278924bf1d | |
| parent | a4bef69f02ce9472bf48a451d72a7cb090014447 (diff) | |
INTEGRATION: CWS ooo64bit01 (1.3.12); FILE MERGED
2004/03/31 16:48:54 fa 1.3.12.3: Back out of changes since 2004-03-24, focus on smaller, more integratable changes
2004/03/29 00:30:07 fa 1.3.12.2: More 64-bit changes. 'rsc' still broken, but not as much as before.
2004/03/15 23:18:45 fa 1.3.12.1: First bits of 64-bitness. #i25651# & more
| -rw-r--r-- | tools/source/generic/poly.cxx | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/tools/source/generic/poly.cxx b/tools/source/generic/poly.cxx index 03a1bfc39048..1c7bfc3288e3 100644 --- a/tools/source/generic/poly.cxx +++ b/tools/source/generic/poly.cxx @@ -2,9 +2,9 @@ * * $RCSfile: poly.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: hr $ $Date: 2004-05-10 14:40:24 $ + * last change: $Author: rt $ $Date: 2004-06-17 13:11:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -68,6 +68,9 @@ #define _SV_POLY_CXX +#ifndef _OSL_ENDIAN_H_ +#include <osl/endian.h> +#endif #ifndef _BIGINT_HXX #include <bigint.hxx> #endif @@ -2028,10 +2031,10 @@ SvStream& operator>>( SvStream& rIStream, Polygon& rPoly ) else { // Feststellen, ob ueber die Operatoren geschrieben werden muss -#if (__SIZEOFLONG) != 4 +#if (SAL_TYPES_SIZEOFLONG) != 4 if ( 1 ) #else -#ifdef __BIGENDIAN +#ifdef OSL_BIGENDIAN if ( rIStream.GetNumberFormatInt() != NUMBERFORMAT_INT_BIGENDIAN ) #else if ( rIStream.GetNumberFormatInt() != NUMBERFORMAT_INT_LITTLEENDIAN ) @@ -2128,10 +2131,10 @@ SvStream& operator<<( SvStream& rOStream, const Polygon& rPoly ) else { // Feststellen, ob ueber die Operatoren geschrieben werden muss -#if (__SIZEOFLONG) != 4 +#if (SAL_TYPES_SIZEOFLONG) != 4 if ( 1 ) #else -#ifdef __BIGENDIAN +#ifdef OSL_BIGENDIAN if ( rOStream.GetNumberFormatInt() != NUMBERFORMAT_INT_BIGENDIAN ) #else if ( rOStream.GetNumberFormatInt() != NUMBERFORMAT_INT_LITTLEENDIAN ) |