summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-01-09 15:42:37 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-01-09 15:42:37 +0100
commit884437ef2e8f6739e149c96be5992253c3720bcb (patch)
tree9f350af56ca4f30ccfb70eb5d9f51f9664e6260c /jvmfwk
parentd5f2ba9a3ebf952cb237141dae33ba9fc06ddabd (diff)
New loplugin:externvar: jvmfwk
Change-Id: I0fee834ba07ecdc713e0e066935773f49a109665
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/util.cxx2
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx2
-rw-r--r--jvmfwk/source/fwkbase.cxx2
3 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
index d1a0088f1510..65fe6424aa52 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/util.cxx
@@ -115,8 +115,6 @@ char const *g_arSearchPaths[] = {
namespace jfw_plugin
{
-extern VendorSupportMapEntry gVendorMap[];
-
#if defined(_WIN32)
bool getSDKInfoFromRegistry(vector<OUString> & vecHome);
bool getJREInfoFromRegistry(vector<OUString>& vecJavaHome);
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
index 553c9f93d759..3947a4d6756f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.hxx
@@ -35,6 +35,8 @@ struct VendorSupportMapEntry
createInstance_func createFunc;
};
+extern VendorSupportMapEntry gVendorMap[];
+
#define BEGIN_VENDOR_MAP() \
VendorSupportMapEntry gVendorMap[] ={
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index b7d1d91cda2a..6eacf33e4bcf 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -43,7 +43,7 @@ using namespace osl;
namespace jfw
{
-bool g_bJavaSet = false;
+static bool g_bJavaSet = false;
namespace {