diff options
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 4fd74df90723..56cb5c7bd7e7 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -33,9 +34,11 @@ #include "sunversion.hxx" #include "diagnostics.h" -using namespace rtl; using namespace std; +using ::rtl::OUString; +using ::rtl::Reference; + #define OUSTR(x) ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(x) ) namespace jfw_plugin { @@ -68,7 +71,9 @@ char const* const* SunInfo::getRuntimePaths(int * size) #if defined(WNT) "/bin/client/jvm.dll", "/bin/hotspot/jvm.dll", - "/bin/classic/jvm.dll" + "/bin/classic/jvm.dll", + // The 64-bit JRE has the jvm in bin/server + "/bin/server/jvm.dll" #elif defined(OS2) "/bin/classic/jvm.dll", #elif UNX @@ -88,6 +93,7 @@ char const* const* SunInfo::getLibraryPaths(int* size) static char const * ar[] = { "/lib/" JFW_PLUGIN_ARCH "/client", + "/lib/" JFW_PLUGIN_ARCH "/server", "/lib/" JFW_PLUGIN_ARCH "/native_threads", "/lib/" JFW_PLUGIN_ARCH @@ -122,3 +128,5 @@ int SunInfo::compareVersions(const rtl::OUString& sSecond) const } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |