diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:42:28 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-08-27 12:42:28 +0000 |
| commit | 53a4ddb1afbdaa4f6745198f2ab39dbfbab9f186 (patch) | |
| tree | 126f17b334642a1685356f10efe9301de2b79339 /sal | |
| parent | 5165f37f4a48d267665533e56f5ccf5301ff249a (diff) | |
INTEGRATION: CWS sb91 (1.14.2); FILE MERGED
2008/07/16 06:49:52 sb 1.14.2.1: #i91567# SPARC64 was tentative; has been replaced by SPARC + IS_LP64
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/rtl/source/macro.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx index 85228f9336a3..a007d9e1cdab 100644 --- a/sal/rtl/source/macro.hxx +++ b/sal/rtl/source/macro.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: macro.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.17 $ * * This file is part of OpenOffice.org. * @@ -71,9 +71,11 @@ this is inserted for the case that the preprocessor ignores error #elif defined S390 # define THIS_ARCH "S390" #elif defined SPARC -# define THIS_ARCH "SPARC" -#elif defined SPARC64 +#if defined IS_LP64 # define THIS_ARCH "SPARC64" +#else +# define THIS_ARCH "SPARC" +#endif #elif defined IRIX # define THIS_ARCH "MIPS" #elif defined MIPS |