summaryrefslogtreecommitdiff
path: root/desktop
diff options
context:
space:
mode:
authorRüdiger Timm <rt@openoffice.org>2008-08-27 12:46:39 +0000
committerRüdiger Timm <rt@openoffice.org>2008-08-27 12:46:39 +0000
commitde6ac4a03059a6503cb39a1c1c0121d3f6c7c0eb (patch)
tree19fa4661d74ccac48ddc8c237d720b7db59af1c6 /desktop
parentfdee4c93eee0c40c706f7848336f3cd450204d1f (diff)
INTEGRATION: CWS sb91 (1.2.104); FILE MERGED
2008/07/17 16:51:14 sb 1.2.104.1: #i91567# adapted to unxsolu4
Diffstat (limited to 'desktop')
-rw-r--r--desktop/source/deployment/misc/dp_platform.cxx6
1 files changed, 4 insertions, 2 deletions
diff --git a/desktop/source/deployment/misc/dp_platform.cxx b/desktop/source/deployment/misc/dp_platform.cxx
index d94a77bf31be..59ed0056f1a0 100644
--- a/desktop/source/deployment/misc/dp_platform.cxx
+++ b/desktop/source/deployment/misc/dp_platform.cxx
@@ -8,7 +8,7 @@
*
* $RCSfile: dp_platform.cxx,v $
*
- * $Revision: 1.2 $
+ * $Revision: 1.3 $
*
* This file is part of OpenOffice.org.
*
@@ -57,7 +57,7 @@
#define PLATFORM_SOLARIS_SPARC "solaris_sparc"
-//#define PLATFORM_SOLARIS_SPARC64 "solaris_sparc64"
+#define PLATFORM_SOLARIS_SPARC64 "solaris_sparc64"
#define PLATFORM_SOLARIS_X86 "solaris_x86"
#define PLATFORM_FREEBSD_X86 "freebsd_x86"
#define PLATFORM_FREEBSD_X86_64 "freebsd_x86_64"
@@ -152,6 +152,8 @@ namespace
ret = checkOSandCPU(OUSTR("Linux"), OUSTR("S390x"));
else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC)))
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC"));
+ else if (token.equals(OUSTR(PLATFORM_SOLARIS_SPARC64)))
+ ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("SPARC64"));
else if (token.equals(OUSTR(PLATFORM_SOLARIS_X86)))
ret = checkOSandCPU(OUSTR("Solaris"), OUSTR("x86"));
else if (token.equals(OUSTR(PLATFORM_FREEBSD_X86)))