diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 13:50:14 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2008-04-22 13:50:14 +0000 |
| commit | a8fc98286b084743e0e0fb7cf22fecc273cc685c (patch) | |
| tree | 6b910625e94d434e9d759f787b0d23cd41041877 /jvmfwk | |
| parent | 721a5b2ab3424694bd87045d6cd57cf4cb3d8ce5 (diff) | |
INTEGRATION: CWS hr50 (1.9.8); FILE MERGED
2008/04/15 12:16:19 hr 1.9.8.1: #86797#: Linux 64 bit builds may have -DINTEL and -DX64_64 defined, change order of platform tests for macro JFW_PLUGIN_ARCH
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx index 4dfae326abdc..54acc5cdf208 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.12 $ + * $Revision: 1.13 $ * * This file is part of OpenOffice.org. * @@ -44,6 +44,8 @@ namespace jfw_plugin //Used by subclasses of VendorBase to build paths to Java runtime #if defined SPARC #define JFW_PLUGIN_ARCH "sparc" +#elif defined X86_64 +#define JFW_PLUGIN_ARCH "amd64" #elif defined INTEL #define JFW_PLUGIN_ARCH "i386" #elif defined POWERPC64 @@ -60,8 +62,6 @@ namespace jfw_plugin #define JFW_PLUGIN_ARCH "s390x" #elif defined S390 #define JFW_PLUGIN_ARCH "s390" -#elif defined X86_64 -#define JFW_PLUGIN_ARCH "amd64" #elif defined ARM #define JFW_PLUGIN_ARCH "arm" #elif defined IA64 |