diff options
| author | David Tardon <dtardon@redhat.com> | 2013-03-27 12:27:12 +0100 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-03-27 17:08:10 +0100 |
| commit | 35ee0188cb85a56c7ea287cc979006d2d01d439b (patch) | |
| tree | de4527f924d6a1381eaf61caeb1c8f93d4b18a04 /jvmfwk | |
| parent | 6190296113a88e57e15242829a4211f811eeec02 (diff) | |
WaE: "UNX" is not defined
Change-Id: I3b72efae6c3ae929eb4f26400a7c73406371c1a2
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 4 | ||||
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index d9751ac84a9d..f3ee1e3c520a 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -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 diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index a4ff38cdaf52..d45555d7c92b 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -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" |