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

WaE: "UNX" is not defined

Browse Source 
Change-Id: I3b72efae6c3ae929eb4f26400a7c73406371c1a2
This commit is contained in:
David Tardon
2013-03-27 12:27:12 +01:00
parent 6190296113
commit 35ee0188cb
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx
View File

@@ -40,7 +40,7 @@ char const* const* OtherInfo::getJavaExePaths(int * size)
#if defined(WNT)
"bin/java.exe",
"jre/bin/java.exe"
#elif UNX
#elif defined UNX
"bin/java",
"jre/bin/java"
#endif
@@ -57,7 +57,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
"/bin/hotspot/jvm.dll",
"/bin/classic/jvm.dll",
"/bin/jrockit/jvm.dll"
#elif UNX
#elif defined UNX
#ifdef MACOSX
"/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22
#else

4
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
View File

@@ -40,7 +40,7 @@ char const* const* SunInfo::getJavaExePaths(int * size)
"java.exe",
"bin/java.exe",
"jre/bin/java.exe"
#elif UNX
#elif defined UNX
"java",
"bin/java",
"jre/bin/java"
@@ -59,7 +59,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
"/bin/classic/jvm.dll",
// The 64-bit JRE has the jvm in bin/server
"/bin/server/jvm.dll"
#elif UNX
#elif defined UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"