Kaydet (Commit) 35ee0188 authored tarafından David Tardon's avatar David Tardon

WaE: "UNX" is not defined

Change-Id: I3b72efae6c3ae929eb4f26400a7c73406371c1a2
üst 61902961
...@@ -40,7 +40,7 @@ char const* const* OtherInfo::getJavaExePaths(int * size) ...@@ -40,7 +40,7 @@ char const* const* OtherInfo::getJavaExePaths(int * size)
#if defined(WNT) #if defined(WNT)
"bin/java.exe", "bin/java.exe",
"jre/bin/java.exe" "jre/bin/java.exe"
#elif UNX #elif defined UNX
"bin/java", "bin/java",
"jre/bin/java" "jre/bin/java"
#endif #endif
...@@ -57,7 +57,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size) ...@@ -57,7 +57,7 @@ char const* const* OtherInfo::getRuntimePaths(int * size)
"/bin/hotspot/jvm.dll", "/bin/hotspot/jvm.dll",
"/bin/classic/jvm.dll", "/bin/classic/jvm.dll",
"/bin/jrockit/jvm.dll" "/bin/jrockit/jvm.dll"
#elif UNX #elif defined UNX
#ifdef MACOSX #ifdef MACOSX
"/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22 "/../../../../../Frameworks/JavaVM.framework/JavaVM" //as of 1.6.0_22
#else #else
......
...@@ -40,7 +40,7 @@ char const* const* SunInfo::getJavaExePaths(int * size) ...@@ -40,7 +40,7 @@ char const* const* SunInfo::getJavaExePaths(int * size)
"java.exe", "java.exe",
"bin/java.exe", "bin/java.exe",
"jre/bin/java.exe" "jre/bin/java.exe"
#elif UNX #elif defined UNX
"java", "java",
"bin/java", "bin/java",
"jre/bin/java" "jre/bin/java"
...@@ -59,7 +59,7 @@ char const* const* SunInfo::getRuntimePaths(int * size) ...@@ -59,7 +59,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
"/bin/classic/jvm.dll", "/bin/classic/jvm.dll",
// The 64-bit JRE has the jvm in bin/server // The 64-bit JRE has the jvm in bin/server
"/bin/server/jvm.dll" "/bin/server/jvm.dll"
#elif UNX #elif defined UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment