diff options
author | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:51:55 +0000 |
---|---|---|
committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-16 12:51:55 +0000 |
commit | d816af3f535c524e0ac87e33a0057ae2a2a13c5b (patch) | |
tree | f022a87e45faec60653ef8000283c0c881fc720b | |
parent | 56e5ddd806371e30e0de91c454557c4dff43e231 (diff) |
INTEGRATION: CWS hr51 (1.13.4); FILE MERGED
2008/06/06 14:11:17 hr 1.13.4.1: #i88947#: Solaris 64 bit support
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx index 54acc5cdf208..533dc7f3c747 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: vendorbase.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.14 $ * * This file is part of OpenOffice.org. * @@ -42,7 +42,9 @@ namespace jfw_plugin //Used by subclasses of VendorBase to build paths to Java runtime -#if defined SPARC +#if defined(__sparcv9) +#define JFW_PLUGIN_ARCH "sparcv9" +#elif defined SPARC #define JFW_PLUGIN_ARCH "sparc" #elif defined X86_64 #define JFW_PLUGIN_ARCH "amd64" |