summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-08-27 09:00:21 +0000
committerRüdiger Timm <rt@openoffice.org>2008-08-27 09:00:21 +0000
commit95e62efda4a9c3a757f2a4f42287f6f2b5b101a3 (patch)
treef7f68cb2ea48384cd0da83daac3419ff9912422c /sal
parentf5cd5bce03229eeb968b833d89e85d59c576c687 (diff)
INTEGRATION: CWS jl110_DEV300 (1.15.22); FILE MERGED
2008/08/15 11:20:17 jl 1.15.22.1: #i92799# Because INTEL is defined before X86_64, THIS_ARCH was always set to x86 instead of X86_64 for Linux 64 bit
Diffstat (limited to 'sal')
-rw-r--r--sal/rtl/source/macro.hxx8
1 files changed, 4 insertions, 4 deletions
diff --git a/sal/rtl/source/macro.hxx b/sal/rtl/source/macro.hxx
index cebbc3f97346..85228f9336a3 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.15 $
+ * $Revision: 1.16 $
*
* This file is part of OpenOffice.org.
*
@@ -58,7 +58,9 @@
this is inserted for the case that the preprocessor ignores error
#endif
-#if defined INTEL
+#if defined X86_64
+# define THIS_ARCH "X86_64"
+#elif defined INTEL
# define THIS_ARCH "x86"
#elif defined POWERPC64
# define THIS_ARCH "PowerPC_64"
@@ -74,8 +76,6 @@ this is inserted for the case that the preprocessor ignores error
# define THIS_ARCH "SPARC64"
#elif defined IRIX
# define THIS_ARCH "MIPS"
-#elif defined X86_64
-# define THIS_ARCH "X86_64"
#elif defined MIPS
# ifdef OSL_BIGENDIAN
# define THIS_ARCH "MIPS_EB"