diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-09 18:08:19 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-09 18:09:41 +0200 |
| commit | 04a290b107ac0c0c7b1e03da541a4a0c315743e1 (patch) | |
| tree | 3fd24ed079b25ca83159491fcf06f6b59acb92b7 /jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | |
| parent | 0ef36a8d631bf891db9ada80e6a213c8b08392b7 (diff) | |
vendorplugin.h is jvmfwk-internal (and no need for extern "C")
Change-Id: I954f789d5850e8016f5900812f9aa99be2416ce4
Diffstat (limited to 'jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx index ab5153dd033f..d1e02ce35b3d 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjavaplugin.cxx @@ -51,7 +51,7 @@ #include "jni.h" #include "rtl/byteseq.hxx" -#include "jvmfwk/vendorplugin.h" +#include "vendorplugin.hxx" #include "util.hxx" #include "sunversion.hxx" #include "vendorlist.hxx" @@ -200,7 +200,6 @@ extern "C" void JNICALL abort_handler() } -extern "C" javaPluginError jfw_plugin_getAllJavaInfos( rtl_uString *sVendor, rtl_uString *sMinVersion, @@ -330,7 +329,6 @@ javaPluginError jfw_plugin_getAllJavaInfos( return JFW_PLUGIN_E_NONE; } -extern "C" javaPluginError jfw_plugin_getJavaInfoByPath( rtl_uString *path, rtl_uString *sVendor, @@ -585,7 +583,6 @@ static void do_msvcr_magic(rtl_uString *jvm_dll) during instantiation. </p> */ -extern "C" javaPluginError jfw_plugin_startJavaVirtualMachine( const JavaInfo *pInfo, const JavaVMOption* arOptions, @@ -782,7 +779,6 @@ javaPluginError jfw_plugin_startJavaVirtualMachine( return errorcode; } -extern "C" javaPluginError jfw_plugin_existJRE(const JavaInfo *pInfo, sal_Bool *exist) { javaPluginError ret = JFW_PLUGIN_E_NONE; |