summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2012-10-07 10:33:46 +0300
committerTor Lillqvist <tml@iki.fi>2012-10-07 10:43:07 +0300
commitc56600dfbeaf687f249e4fb641044595892b4ebc (patch)
treecd7cc9bc76baf73c51e9005d59379e7a50fa9360 /jvmfwk
parent261e9c71f9d4a12865bba7e7226ffe363aa1460b (diff)
Move the #ifndef DISABLE_DYNLOADING a bit earlier
Change-Id: I1777d6304b2ebb218c0f85c778f1a66d05c4f454
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/source/framework.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/jvmfwk/source/framework.cxx b/jvmfwk/source/framework.cxx
index 2f1760aae209..4694bf6029a8 100644
--- a/jvmfwk/source/framework.cxx
+++ b/jvmfwk/source/framework.cxx
@@ -387,11 +387,11 @@ javaFrameworkError SAL_CALL jfw_startVM(JavaVMOption *arOptions, sal_Int32 cOpti
jfw::VendorSettings aVendorSettings;
rtl::OUString sLibPath = aVendorSettings.getPluginLibrary(aInfo.getVendor());
+#ifndef DISABLE_DYNLOADING
osl::Module modulePlugin(sLibPath);
if ( ! modulePlugin)
return JFW_E_NO_PLUGIN;
-#ifndef DISABLE_DYNLOADING
rtl::OUString sFunctionName(
RTL_CONSTASCII_USTRINGPARAM("jfw_plugin_startJavaVirtualMachine"));
jfw_plugin_startJavaVirtualMachine_ptr pFunc =