mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS hr50 (1.9.8); FILE MERGED

Browse Source 
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
This commit is contained in:
Jens-Heiner Rechtien
2008-04-22 13:50:14 +00:00
parent 721a5b2ab3
commit a8fc98286b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
jvmfwk/plugins/sunmajor/pluginlib/vendorbase.hxx
View File

@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite * OpenOffice.org - a multi-platform office productivity suite
* *
* $RCSfile: vendorbase.hxx,v $ * $RCSfile: vendorbase.hxx,v $
* $Revision: 1.12 $ * $Revision: 1.13 $
* *
* This file is part of OpenOffice.org. * 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 //Used by subclasses of VendorBase to build paths to Java runtime
#if defined SPARC #if defined SPARC
#define JFW_PLUGIN_ARCH "sparc" #define JFW_PLUGIN_ARCH "sparc"
#elif defined X86_64
#define JFW_PLUGIN_ARCH "amd64"
#elif defined INTEL #elif defined INTEL
#define JFW_PLUGIN_ARCH "i386" #define JFW_PLUGIN_ARCH "i386"
#elif defined POWERPC64 #elif defined POWERPC64
@@ -60,8 +62,6 @@ namespace jfw_plugin
#define JFW_PLUGIN_ARCH "s390x" #define JFW_PLUGIN_ARCH "s390x"
#elif defined S390 #elif defined S390
#define JFW_PLUGIN_ARCH "s390" #define JFW_PLUGIN_ARCH "s390"
#elif defined X86_64
#define JFW_PLUGIN_ARCH "amd64"
#elif defined ARM #elif defined ARM
#define JFW_PLUGIN_ARCH "arm" #define JFW_PLUGIN_ARCH "arm"
#elif defined IA64 #elif defined IA64