summaryrefslogtreecommitdiff
path: root/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/util.cxx')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx10
1 files changed, 10 insertions, 0 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index fea25b05e078..f488b15653db 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -61,6 +61,7 @@ using ::rtl::Reference;
#endif
#ifdef UNX
+#if !(defined MACOSX && defined X86_64)
namespace {
char const *g_arJavaNames[] = {
"",
@@ -113,6 +114,7 @@ char const *g_arSearchPaths[] = {
#endif
};
}
+#endif
#endif // UNX
namespace jfw_plugin
@@ -1137,6 +1139,14 @@ void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
getJREInfoByPath("file:////usr/jdk/latest", vecInfos);
}
+#elif defined MACOSX && defined X86_64
+
+void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
+{
+ // Oracle Java 7
+ getJREInfoByPath("file:///Library/Internet Plug-Ins/JavaAppletPlugin.plugin/Contents/Home", vecInfos);
+}
+
#else
void createJavaInfoDirScan(vector<rtl::Reference<VendorBase> >& vecInfos)
{